Inspection of "Test for the value in total_messages" - ankitjain28may/openchat - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 5e0cf4...450790 )

by Ankit

created 2017-01-14 14:23 UTC

Status

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -14,26 +14,26 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 						<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 @@  discard block
 block discarded – undo
 					</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 @@  discard block
 block discarded – undo
 						</form>
 					</div>
 					<?php
-						endif;
-					?>
+                        endif;
+                    ?>
 				</div>
 
 				<div class="footer">
@@ -119,13 +119,13 @@  discard block
 block discarded – undo
 			</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/");
 }
 ?>
 

Please login to merge, or discard this patch.

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\User;
 use ChatApp\Profile;
 use ChatApp\Session;
@@ -10,16 +10,16 @@  discard block
 block discarded – undo
 // die("Hello");
 
 $user = explode("/", $_SERVER['REQUEST_URI']);
-$user = $user[count($user)-1];
+$user = $user[count($user) - 1];
 $userId = Session::get('start');
-if($userId != null && $user == "account.php")
+if ($userId != null && $user == "account.php")
 {
 	$obUser = new User();
 	$row = $obUser->userDetails($userId, True);
 
-	if($row != NULL)
+	if ($row != NULL)
 	{
-		$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
+		$location = getenv('APP_URL')."/views/account.php/".$row['username'];
 		header("Location:".$location);
 	}
 }
@@ -27,10 +27,10 @@  discard block
 block discarded – undo
 {
 	$obUser = new User();
 	$row = $obUser->userDetails($user, False);
-	if($row != NULL):
+	if ($row != NULL):
 		$userId = $row['login_id'];
 		$details = Profile::getProfile($userId);
-		if($details != NULL)
+		if ($details != NULL)
 			$row = array_merge($row, $details);
 		else
 			header("Location:".getenv('APP_URL')."/views/error.php");
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 		            <a id="brand" href="">OpenChat</a>
 		            <ul class="nav-right">
 		                <li><a href="../../index.php">About</a></li>
-		                <?php if(Session::get('start') != null): ?>
+		                <?php if (Session::get('start') != null): ?>
 							<li><a href="../message.php">Message</a></li>
 							<li><a href="../logout.php">Log out</a></li>
 						<?php else: ?>
@@ -68,20 +68,20 @@  discard block
 block discarded – undo
 						<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']): ?>
+						<?php if (Session::get('start') == $row['login_id']): ?>
 							<div class="edit">
 								<a href="#">Edit Profile</a>
 							</div>
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
 					</div>
 
 					<?php
-						if(Session::get('start') == $row['login_id']):
+						if (Session::get('start') == $row['login_id']):
 					?>
 
 					<div class="boxx" id="profile">
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
 							<label>Education : </label>
 							<input type="text" name="education" id="education" value="<?php echo $row['education']; ?>"></input>
 							<label>Gender : </label><br>
-							<input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender']=='Male')?'checked':'' ?>> Male<br>
-							<input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender']=='Female')?'checked':'' ?>> Female<br>
+							<input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender'] == 'Male') ? 'checked' : '' ?>> Male<br>
+							<input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender'] == 'Female') ? 'checked' : '' ?>> Female<br>
 							<input type="submit" name="submit" value="Done" id="submit">
 						</form>
 					</div>

Please login to merge, or discard this patch.

Braces +31 added lines, -22 removed lines patch added patch discarded remove patch

@@ -22,19 +22,19 @@  discard block
 block discarded – undo
 		$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
 		header("Location:".$location);
 	}
-}
-elseif ($user != "account.php")
+} 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");
-?>
+		if($details != NULL) {
+					$row = array_merge($row, $details);
+		} else {
+					header("Location:".getenv('APP_URL')."/views/error.php");
+		}
+		?>
 
 		<!Doctype html>
 		<html>
@@ -51,10 +51,13 @@  discard block
 block discarded – undo
 		                <?php if(Session::get('start') != null): ?>
 							<li><a href="../message.php">Message</a></li>
 							<li><a href="../logout.php">Log out</a></li>
-						<?php else: ?>
+						<?php else {
+    : ?>
 							<li><a href="../login.php">Login</a></li>
 							<li><a href="../register.php">Register</a></li>
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 		            </ul>
 		        </div>
 
@@ -68,16 +71,21 @@  discard block
 block discarded – undo
 						<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>
@@ -119,11 +127,12 @@  discard block
 block discarded – undo
 			</body>
 		</html>
 <?php
-	else:
+	else {
+	    :
 		header("Location:".getenv('APP_URL')."/views/error.php");
+	}
 	endif;
-}
-else
+} else
 {
 	header("Location: ".getenv('APP_URL')."/views/");
 }

Please login to merge, or discard this patch.

views/validate_register.php 3 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 	$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([]);

Please login to merge, or discard this patch.

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

@@ -13,9 +13,10 @@
 block discarded – undo
 	$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([]);
+	}
+	}
 

Please login to merge, or discard this patch.

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -5,25 +5,25 @@
 block discarded – undo
 
 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([]);
 }
 
 

Please login to merge, or discard this patch.

src/Register.php 4 patches

Doc Comments +3 added lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Indentation +106 added lines, -106 removed lines patch added patch discarded remove patch

@@ -12,115 +12,115 @@
 block discarded – undo
 
 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;
+    }
 }

Please login to merge, or discard this patch.

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -2,7 +2,7 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 			$this->onError("mob", " *Enter correct Mobile Number");
 		}
 
-		if($this->flag == 1)
+		if ($this->flag == 1)
 		{
 			return json_encode($this->error);
 		}
@@ -67,26 +67,26 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		foreach ($data as $key => $value) {
 			$data[$key] = trim($data[$key]);
 			$value = trim($value);
-			if(empty($value))
+			if (empty($value))
 			{
 				$this->onError($key, $errorCode[$key]);
 			}

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

src/Login.php 3 patches

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
 
 		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 @@  discard block
 block discarded – undo
 					$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 @@  discard block
 block discarded – undo
 						$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 @@  discard block
 block discarded – undo
 		foreach ($data as $key => $value) {
 			$data[$key] = trim($data[$key]);
 			$value = trim($value);
-			if(empty($value))
+			if (empty($value))
 			{
 				$this->onError($key, $errorCode[$key]);
 			}

Please login to merge, or discard this patch.

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Indentation +77 added lines, -77 removed lines patch added patch discarded remove patch

@@ -11,96 +11,96 @@
 block discarded – undo
 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;
+    }
 
 }
 

Please login to merge, or discard this patch.

views/validate_login.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@  discard block
 block discarded – undo
 <?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 @@  discard block
 block discarded – undo
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    if(isset($result))
+    if (isset($result))
         echo $result;
     else
         echo json_encode([]);

Please login to merge, or discard this patch.

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

@@ -14,8 +14,9 @@
 block discarded – undo
         '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

Please login to merge, or discard this patch.

tests/TestUser.php 1 patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

@@ -51,9 +51,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with empty username
-    */
+     * @depends test_authRegister
+     *  Testing for the register with empty username
+     */
     public function test_authregisterEmptyUsername()
     {
         $output = $this->obRegister->authregister(
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with invalid email credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the register with invalid email credentials
+     */
     public function test_authregisterInvalidEmail()
     {
         $output = $this->obRegister->authregister(
@@ -103,9 +103,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the register with repeated credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the register with repeated credentials
+     */
     public function test_authregisterInvalidCredentials()
     {
         $output = $this->obRegister->authregister(
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with correct credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with correct credentials
+     */
 
     public function test_authLogin()
     {
@@ -163,9 +163,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with empty credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with empty credentials
+     */
 
     public function test_authLoginEmptyValues()
     {
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with invalid or wrong email
-    */
+     * @depends test_authRegister
+     *  Testing for the login with invalid or wrong email
+     */
 
     public function test_authLoginWrongEmail()
     {
@@ -215,9 +215,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with invalid email credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with invalid email credentials
+     */
     public function test_authLoginInvalidUsernameEmail()
     {
         $output = $this->obLogin->authLogin(
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the login with invalid password credentials
-    */
+     * @depends test_authRegister
+     *  Testing for the login with invalid password credentials
+     */
     public function test_authLoginInvalidPassword()
     {
         $output = $this->obLogin->authLogin(
@@ -260,9 +260,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Profile::class with valid login_id
-    */
+     * @depends test_authRegister
+     *  Testing for the Profile::class with valid login_id
+     */
     public function test_getProfile()
     {
         $output = Profile::getProfile(1);
@@ -275,9 +275,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Profile::class with invalid login_id
-    */
+     * @depends test_authRegister
+     *  Testing for the Profile::class with invalid login_id
+     */
     public function test_getProfileInvalidID()
     {
         $output = Profile::getProfile(0);
@@ -285,9 +285,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the User::class with valid login_id
-    */
+     * @depends test_authRegister
+     *  Testing for the User::class with valid login_id
+     */
     public function test_userDetails()
     {
         $expectedOutput = [
@@ -306,9 +306,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the User::class with invalid data
-    */
+     * @depends test_authRegister
+     *  Testing for the User::class with invalid data
+     */
     public function test_userDetailsInvalidID()
     {
         $output = $this->obUser->userDetails(0, True);
@@ -316,9 +316,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for email
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for email
+     */
     public function test_validateEmailInDb()
     {
         $output = $this->obValidate->validateEmailInDb('[email protected]');
@@ -326,9 +326,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for username
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for username
+     */
     public function test_validateUsernameInDb()
     {
         $output = $this->obValidate->validateUsernameInDb('test');
@@ -336,9 +336,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for non-existing username
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for non-existing username
+     */
     public function test_validateUsernameInDbNot()
     {
         $output = $this->obValidate->validateUsernameInDb('abc');
@@ -346,9 +346,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Validate::class for non-existing email
-    */
+     * @depends test_authRegister
+     *  Testing for the Validate::class for non-existing email
+     */
     public function test_validateEmailInDbNot()
     {
         $output = $this->obValidate->validateEmailInDb('[email protected]');
@@ -356,9 +356,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends test_authRegister
-    *  Testing for the Online::class
-    */
+     * @depends test_authRegister
+     *  Testing for the Online::class
+     */
     public function test_Online()
     {
         Online::setOnlineStatus(1);
@@ -373,9 +373,9 @@  discard block
 block discarded – undo
 
 
     /**
-    *   @depends test_Online
-    *  Empty the DB
-    */
+     *   @depends test_Online
+     *  Empty the DB
+     */
     public function test_EmptyDB()
     {
         $connect = mysqli_connect(

Please login to merge, or discard this patch.

tests/TestAll.php 2 patches

Unused Use Statements -1 removed lines patch added patch discarded remove patch

@@ -8,7 +8,6 @@
 block discarded – undo
 use ChatApp\Compose;
 use ChatApp\Reply;
 use ChatApp\Session;
-
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();

Please login to merge, or discard this patch.

Indentation +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -48,9 +48,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends testAuthRegister
-    *  Register User2
-    */
+     * @depends testAuthRegister
+     *  Register User2
+     */
     public function testAuthRegister2()
     {
         $output = $this->obRegister->authRegister(
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for the register with empty username
-    */
+     * @depends testAuthRegister2
+     *  Testing for the register with empty username
+     */
     public function testCompose()
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for Search Class
-    */
+     * @depends testAuthRegister2
+     *  Testing for Search Class
+     */
     public function testSearch($userId)
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -170,9 +170,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for Reply Class
-    */
+     * @depends testAuthRegister2
+     *  Testing for Reply Class
+     */
     public function testReply($userId)
     {
         $msg = [
@@ -223,9 +223,9 @@  discard block
 block discarded – undo
     }
 
     /**
-    * @depends testAuthRegister2
-    *  Testing for Search Class
-    */
+     * @depends testAuthRegister2
+     *  Testing for Search Class
+     */
     public function testSearchWithTotalMessages($userId)
     {
         $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
@@ -251,9 +251,9 @@  discard block
 block discarded – undo
 
 
     /**
-    *   @depends testSearchWithTotalMessages
-    *  Empty the DB
-    */
+     *   @depends testSearchWithTotalMessages
+     *  Empty the DB
+     */
     public function test_EmptyDB()
     {
         $connect = mysqli_connect(

Please login to merge, or discard this patch.

		@@ -14,26 +14,26 @@ discard block
		block discarded – undo
14	14	$userId = Session::get('start');
15	15	if($userId != null && $user == "account.php")
16	16	{
17		- $obUser = new User();
18		- $row = $obUser->userDetails($userId, True);
	17	+ $obUser = new User();
	18	+ $row = $obUser->userDetails($userId, True);
19	19
20		- if($row != NULL)
21		- {
22		- $location = getenv('APP_URL') . "/views/account.php/". $row['username'];
23		- header("Location:".$location);
24		- }
	20	+ if($row != NULL)
	21	+ {
	22	+ $location = getenv('APP_URL') . "/views/account.php/". $row['username'];
	23	+ header("Location:".$location);
	24	+ }
25	25	}
26	26	elseif ($user != "account.php")
27	27	{
28		- $obUser = new User();
29		- $row = $obUser->userDetails($user, False);
30		- if($row != NULL):
31		- $userId = $row['login_id'];
32		- $details = Profile::getProfile($userId);
33		- if($details != NULL)
34		- $row = array_merge($row, $details);
35		- else
36		- header("Location:".getenv('APP_URL')."/views/error.php");
	28	+ $obUser = new User();
	29	+ $row = $obUser->userDetails($user, False);
	30	+ if($row != NULL):
	31	+ $userId = $row['login_id'];
	32	+ $details = Profile::getProfile($userId);
	33	+ if($details != NULL)
	34	+ $row = array_merge($row, $details);
	35	+ else
	36	+ header("Location:".getenv('APP_URL')."/views/error.php");
37	37	?>
38	38
39	39	<!Doctype html>
		@@ -68,18 +68,18 @@ discard block
		block discarded – undo
68	68	<div class="brief">
69	69	<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
70	70	<?php foreach ($row as $key => $value) {
71		- if($key =='username' && $value != null)
72		- echo '<p>Username: '.$row["username"] .'</p><br>';
73		- if($key == 'email' && $value != null)
74		- echo '<p>Email Id: '.$row["email"] .'</p><br>';
75		- if($key == 'status' && $value != null)
76		- echo '<p>Status: '.$row["status"] .'</p><br>';
77		- if($key == 'education' && $value != null)
78		- echo '<p>Education: '.$row["education"] .'</p><br>';
79		- if($key == 'gender' && $value != null)
80		- echo '<p>Gender: '.$row["gender"] .'</p><br>';
81		- }
82		- ?>
	71	+ if($key =='username' && $value != null)
	72	+ echo '<p>Username: '.$row["username"] .'</p><br>';
	73	+ if($key == 'email' && $value != null)
	74	+ echo '<p>Email Id: '.$row["email"] .'</p><br>';
	75	+ if($key == 'status' && $value != null)
	76	+ echo '<p>Status: '.$row["status"] .'</p><br>';
	77	+ if($key == 'education' && $value != null)
	78	+ echo '<p>Education: '.$row["education"] .'</p><br>';
	79	+ if($key == 'gender' && $value != null)
	80	+ echo '<p>Gender: '.$row["gender"] .'</p><br>';
	81	+ }
	82	+ ?>
83	83	</div>
84	84	<?php if(Session::get('start') == $row['login_id']): ?>
85	85	<div class="edit">
		@@ -89,8 +89,8 @@ discard block
		block discarded – undo
89	89	</div>
90	90
91	91	<?php
92		- if(Session::get('start') == $row['login_id']):
93		- ?>
	92	+ if(Session::get('start') == $row['login_id']):
	93	+ ?>
94	94
95	95	<div class="boxx" id="profile">
96	96	<form method="post" action="../profile_generate.php">
		@@ -105,8 +105,8 @@ discard block
		block discarded – undo
105	105	</form>
106	106	</div>
107	107	<?php
108		- endif;
109		- ?>
	108	+ endif;
	109	+ ?>
110	110	</div>
111	111
112	112	<div class="footer">
		@@ -119,13 +119,13 @@ discard block
		block discarded – undo
119	119	</body>
120	120	</html>
121	121	<?php
122		- else:
123		- header("Location:".getenv('APP_URL')."/views/error.php");
124		- endif;
	122	+ else:
	123	+ header("Location:".getenv('APP_URL')."/views/error.php");
	124	+ endif;
125	125	}
126	126	else
127	127	{
128		- header("Location: ".getenv('APP_URL')."/views/");
	128	+ header("Location: ".getenv('APP_URL')."/views/");
129	129	}
130	130	?>
131	131

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-require_once (dirname(__DIR__) . '/vendor/autoload.php');
	3	+require_once (dirname(__DIR__).'/vendor/autoload.php');
4	4	use ChatApp\User;
5	5	use ChatApp\Profile;
6	6	use ChatApp\Session;
		@@ -10,16 +10,16 @@ discard block
		block discarded – undo
10	10	// die("Hello");
11	11
12	12	$user = explode("/", $_SERVER['REQUEST_URI']);
13		-$user = $user[count($user)-1];
	13	+$user = $user[count($user) - 1];
14	14	$userId = Session::get('start');
15		-if($userId != null && $user == "account.php")
	15	+if ($userId != null && $user == "account.php")
16	16	{
17	17	$obUser = new User();
18	18	$row = $obUser->userDetails($userId, True);
19	19
20		- if($row != NULL)
	20	+ if ($row != NULL)
21	21	{
22		- $location = getenv('APP_URL') . "/views/account.php/". $row['username'];
	22	+ $location = getenv('APP_URL')."/views/account.php/".$row['username'];
23	23	header("Location:".$location);
24	24	}
25	25	}
		@@ -27,10 +27,10 @@ discard block
		block discarded – undo
27	27	{
28	28	$obUser = new User();
29	29	$row = $obUser->userDetails($user, False);
30		- if($row != NULL):
	30	+ if ($row != NULL):
31	31	$userId = $row['login_id'];
32	32	$details = Profile::getProfile($userId);
33		- if($details != NULL)
	33	+ if ($details != NULL)
34	34	$row = array_merge($row, $details);
35	35	else
36	36	header("Location:".getenv('APP_URL')."/views/error.php");
		@@ -48,7 +48,7 @@ discard block
		block discarded – undo
48	48	<a id="brand" href="">OpenChat</a>
49	49	<ul class="nav-right">
50	50	<li><a href="../../index.php">About</a></li>
51		- <?php if(Session::get('start') != null): ?>
	51	+ <?php if (Session::get('start') != null): ?>
52	52	<li><a href="../message.php">Message</a></li>
53	53	<li><a href="../logout.php">Log out</a></li>
54	54	<?php else: ?>
		@@ -68,20 +68,20 @@ discard block
		block discarded – undo
68	68	<div class="brief">
69	69	<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
70	70	<?php foreach ($row as $key => $value) {
71		- if($key =='username' && $value != null)
72		- echo '<p>Username: '.$row["username"] .'</p><br>';
73		- if($key == 'email' && $value != null)
74		- echo '<p>Email Id: '.$row["email"] .'</p><br>';
75		- if($key == 'status' && $value != null)
76		- echo '<p>Status: '.$row["status"] .'</p><br>';
77		- if($key == 'education' && $value != null)
78		- echo '<p>Education: '.$row["education"] .'</p><br>';
79		- if($key == 'gender' && $value != null)
80		- echo '<p>Gender: '.$row["gender"] .'</p><br>';
	71	+ if ($key == 'username' && $value != null)
	72	+ echo '<p>Username: '.$row["username"].'</p><br>';
	73	+ if ($key == 'email' && $value != null)
	74	+ echo '<p>Email Id: '.$row["email"].'</p><br>';
	75	+ if ($key == 'status' && $value != null)
	76	+ echo '<p>Status: '.$row["status"].'</p><br>';
	77	+ if ($key == 'education' && $value != null)
	78	+ echo '<p>Education: '.$row["education"].'</p><br>';
	79	+ if ($key == 'gender' && $value != null)
	80	+ echo '<p>Gender: '.$row["gender"].'</p><br>';
81	81	}
82	82	?>
83	83	</div>
84		- <?php if(Session::get('start') == $row['login_id']): ?>
	84	+ <?php if (Session::get('start') == $row['login_id']): ?>
85	85	<div class="edit">
86	86	<a href="#">Edit Profile</a>
87	87	</div>
		@@ -89,7 +89,7 @@ discard block
		block discarded – undo
89	89	</div>
90	90
91	91	<?php
92		- if(Session::get('start') == $row['login_id']):
	92	+ if (Session::get('start') == $row['login_id']):
93	93	?>
94	94
95	95	<div class="boxx" id="profile">
		@@ -99,8 +99,8 @@ discard block
		block discarded – undo
99	99	<label>Education : </label>
100	100	<input type="text" name="education" id="education" value="<?php echo $row['education']; ?>"></input>
101	101	<label>Gender : </label><br>
102		- <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender']=='Male')?'checked':'' ?>> Male<br>
103		- <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender']=='Female')?'checked':'' ?>> Female<br>
	102	+ <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender'] == 'Male') ? 'checked' : '' ?>> Male<br>
	103	+ <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender'] == 'Female') ? 'checked' : '' ?>> Female<br>
104	104	<input type="submit" name="submit" value="Done" id="submit">
105	105	</form>
106	106	</div>

		@@ -22,19 +22,19 @@ discard block
		block discarded – undo
22	22	$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
23	23	header("Location:".$location);
24	24	}
25		-}
26		-elseif ($user != "account.php")
	25	+} elseif ($user != "account.php")
27	26	{
28	27	$obUser = new User();
29	28	$row = $obUser->userDetails($user, False);
30	29	if($row != NULL):
31	30	$userId = $row['login_id'];
32	31	$details = Profile::getProfile($userId);
33		- if($details != NULL)
34		- $row = array_merge($row, $details);
35		- else
36		- header("Location:".getenv('APP_URL')."/views/error.php");
37		-?>
	32	+ if($details != NULL) {
	33	+ $row = array_merge($row, $details);
	34	+ } else {
	35	+ header("Location:".getenv('APP_URL')."/views/error.php");
	36	+ }
	37	+ ?>
38	38
39	39	<!Doctype html>
40	40	<html>
		@@ -51,10 +51,13 @@ discard block
		block discarded – undo
51	51	<?php if(Session::get('start') != null): ?>
52	52	<li><a href="../message.php">Message</a></li>
53	53	<li><a href="../logout.php">Log out</a></li>
54		- <?php else: ?>
	54	+ <?php else {
	55	+ : ?>
55	56	<li><a href="../login.php">Login</a></li>
56	57	<li><a href="../register.php">Register</a></li>
57		- <?php endif; ?>
	58	+ <?php endif;
	59	+}
	60	+?>
58	61	</ul>
59	62	</div>
60	63
		@@ -68,16 +71,21 @@ discard block
		block discarded – undo
68	71	<div class="brief">
69	72	<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
70	73	<?php foreach ($row as $key => $value) {
71		- if($key =='username' && $value != null)
72		- echo '<p>Username: '.$row["username"] .'</p><br>';
73		- if($key == 'email' && $value != null)
74		- echo '<p>Email Id: '.$row["email"] .'</p><br>';
75		- if($key == 'status' && $value != null)
76		- echo '<p>Status: '.$row["status"] .'</p><br>';
77		- if($key == 'education' && $value != null)
78		- echo '<p>Education: '.$row["education"] .'</p><br>';
79		- if($key == 'gender' && $value != null)
80		- echo '<p>Gender: '.$row["gender"] .'</p><br>';
	74	+ if($key =='username' && $value != null) {
	75	+ echo '<p>Username: '.$row["username"] .'</p><br>';
	76	+ }
	77	+ if($key == 'email' && $value != null) {
	78	+ echo '<p>Email Id: '.$row["email"] .'</p><br>';
	79	+ }
	80	+ if($key == 'status' && $value != null) {
	81	+ echo '<p>Status: '.$row["status"] .'</p><br>';
	82	+ }
	83	+ if($key == 'education' && $value != null) {
	84	+ echo '<p>Education: '.$row["education"] .'</p><br>';
	85	+ }
	86	+ if($key == 'gender' && $value != null) {
	87	+ echo '<p>Gender: '.$row["gender"] .'</p><br>';
	88	+ }
81	89	}
82	90	?>
83	91	</div>
		@@ -119,11 +127,12 @@ discard block
		block discarded – undo
119	127	</body>
120	128	</html>
121	129	<?php
122		- else:
	130	+ else {
	131	+ :
123	132	header("Location:".getenv('APP_URL')."/views/error.php");
	133	+ }
124	134	endif;
125		-}
126		-else
	135	+} else
127	136	{
128	137	header("Location: ".getenv('APP_URL')."/views/");
129	138	}

		@@ -1,9 +1,9 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-require (dirname(__DIR__) . '/vendor/autoload.php');
	3	+require (dirname(__DIR__).'/vendor/autoload.php');
4	4	use ChatApp\Register;
5	5
6		-if(isset($_POST['q']))
	6	+if (isset($_POST['q']))
7	7	{
8	8	$registerField = json_decode($_POST['q']);
9	9	$name = $registerField->name;
		@@ -13,7 +13,7 @@ discard block
		block discarded – undo
13	13	$password = $registerField->password;
14	14	$obRegister = new Register();
15	15	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16		- if(isset($result))
	16	+ if (isset($result))
17	17	echo $result;
18	18	else
19	19	echo json_encode([]);

		@@ -13,9 +13,10 @@
		block discarded – undo
13	13	$password = $registerField->password;
14	14	$obRegister = new Register();
15	15	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16		- if(isset($result))
17		- echo $result;
18		- else
19		- echo json_encode([]);
20		-}
	16	+ if(isset($result)) {
	17	+ echo $result;
	18	+ } else {
	19	+ echo json_encode([]);
	20	+ }
	21	+ }
21	22

		@@ -5,25 +5,25 @@
		block discarded – undo
5	5
6	6	if(isset($_POST['q']))
7	7	{
8		- $registerField = json_decode($_POST['q']);
9		- $name = $registerField->name;
10		- $email = $registerField->email;
11		- $username = $registerField->username;
12		- $mob = $registerField->mob;
13		- $password = $registerField->password;
14		- $obRegister = new Register();
15		- $data = array(
16		- 'name' => $name,
17		- 'email' => $email,
18		- 'username' => $username,
19		- 'passRegister' => $password,
20		- 'mob' => $mob
21		- );
22		- $result = $obRegister->authRegister($data);
23		- if(isset($result))
24		- echo $result;
25		- else
26		- echo json_encode([]);
	8	+ $registerField = json_decode($_POST['q']);
	9	+ $name = $registerField->name;
	10	+ $email = $registerField->email;
	11	+ $username = $registerField->username;
	12	+ $mob = $registerField->mob;
	13	+ $password = $registerField->password;
	14	+ $obRegister = new Register();
	15	+ $data = array(
	16	+ 'name' => $name,
	17	+ 'email' => $email,
	18	+ 'username' => $username,
	19	+ 'passRegister' => $password,
	20	+ 'mob' => $mob
	21	+ );
	22	+ $result = $obRegister->authRegister($data);
	23	+ if(isset($result))
	24	+ echo $result;
	25	+ else
	26	+ echo json_encode([]);
27	27	}
28	28
29	29

		@@ -97,6 +97,9 @@
		block discarded – undo
97	97	}
98	98
99	99
	100	+ /**
	101	+ * @param string $value
	102	+ */
100	103	public function onError($key, $value)
101	104	{
102	105	$this->flag = 1;

		@@ -12,115 +12,115 @@
		block discarded – undo
12	12
13	13	class Register
14	14	{
15		- protected $error;
16		- protected $flag;
17		- protected $obValidate;
18		- protected $connect;
19		-
20		- public function __construct()
21		- {
22		- $this->error = array();
23		- $this->flag = 0;
24		- $this->connect = mysqli_connect(
	15	+ protected $error;
	16	+ protected $flag;
	17	+ protected $obValidate;
	18	+ protected $connect;
	19	+
	20	+ public function __construct()
	21	+ {
	22	+ $this->error = array();
	23	+ $this->flag = 0;
	24	+ $this->connect = mysqli_connect(
25	25	getenv('DB_HOST'),
26	26	getenv('DB_USER'),
27	27	getenv('DB_PASSWORD'),
28	28	getenv('DB_NAME')
29	29	);
30		- $this->obValidate = new Validate();
31		-
32		- }
33		-
34		- public function authRegister($data)
35		- {
36		- $data = $this->emptyValue($data);
37		- $name = $data["name"];
38		- $email = $data["email"];
39		- $username = $data["username"];
40		- $mob = $data["mob"];
41		- $password = $data["passRegister"];
42		- $userId = '';
43		-
44		- if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
45		- {
46		- $this->onError("email", " *Enter correct Email address");
47		- }
48		- else if($this->obValidate->validateEmailInDb($email) === 1)
49		- {
50		- $this->onError("email", " *Email is already registered");
51		- }
52		-
53		- if($this->obValidate->validateUsernameInDb($username) === 1)
54		- {
55		- $this->onError("username", " *Username is already registered");
56		- }
57		-
58		- if (!preg_match("/^[0-9]{10}$/", $data["mob"])) {
59		- $this->onError("mob", " *Enter correct Mobile Number");
60		- }
61		-
62		- if($this->flag == 1)
63		- {
64		- return json_encode($this->error);
65		- }
66		-
67		- $password = md5($password);
68		-
69		- $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
70		- if(!$this->connect->query($query))
71		- {
72		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
73		- }
74		- $query = "SELECT id FROM register WHERE email = '$email'";
75		- if($result = $this->connect->query($query))
76		- {
77		- $row = $result->fetch_assoc();
78		- $userId = $row['id'];
79		- $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
80		-
81		- if(!$this->connect->query($query))
82		- {
83		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
84		- }
85		-
86		- $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
87		- if(!$this->connect->query($query))
88		- {
89		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
90		- }
91		-
92		- Session::put('start', $userId);
93		- return json_encode([
94		- "location" => getenv('APP_URL')."/views/account.php"
95		- ]);
96		- }
97		- }
98		-
99		-
100		- public function onError($key, $value)
101		- {
102		- $this->flag = 1;
103		- $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
104		- }
105		-
106		- public function emptyValue($data)
107		- {
108		- $errorCode = array(
109		- "name" => " *Enter the name",
110		- "email" => " *Enter the email address",
111		- "username" => " *Enter the username",
112		- "passRegister" => " *Enter the password",
113		- "mob" => " *Enter the Mobile Number"
114		- );
115		-
116		- foreach ($data as $key => $value) {
117		- $data[$key] = trim($data[$key]);
118		- $value = trim($value);
119		- if(empty($value))
120		- {
121		- $this->onError($key, $errorCode[$key]);
122		- }
123		- }
124		- return $data;
125		- }
	30	+ $this->obValidate = new Validate();
	31	+
	32	+ }
	33	+
	34	+ public function authRegister($data)
	35	+ {
	36	+ $data = $this->emptyValue($data);
	37	+ $name = $data["name"];
	38	+ $email = $data["email"];
	39	+ $username = $data["username"];
	40	+ $mob = $data["mob"];
	41	+ $password = $data["passRegister"];
	42	+ $userId = '';
	43	+
	44	+ if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
	45	+ {
	46	+ $this->onError("email", " *Enter correct Email address");
	47	+ }
	48	+ else if($this->obValidate->validateEmailInDb($email) === 1)
	49	+ {
	50	+ $this->onError("email", " *Email is already registered");
	51	+ }
	52	+
	53	+ if($this->obValidate->validateUsernameInDb($username) === 1)
	54	+ {
	55	+ $this->onError("username", " *Username is already registered");
	56	+ }
	57	+
	58	+ if (!preg_match("/^[0-9]{10}$/", $data["mob"])) {
	59	+ $this->onError("mob", " *Enter correct Mobile Number");
	60	+ }
	61	+
	62	+ if($this->flag == 1)
	63	+ {
	64	+ return json_encode($this->error);
	65	+ }
	66	+
	67	+ $password = md5($password);
	68	+
	69	+ $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
	70	+ if(!$this->connect->query($query))
	71	+ {
	72	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	73	+ }
	74	+ $query = "SELECT id FROM register WHERE email = '$email'";
	75	+ if($result = $this->connect->query($query))
	76	+ {
	77	+ $row = $result->fetch_assoc();
	78	+ $userId = $row['id'];
	79	+ $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
	80	+
	81	+ if(!$this->connect->query($query))
	82	+ {
	83	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	84	+ }
	85	+
	86	+ $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
	87	+ if(!$this->connect->query($query))
	88	+ {
	89	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	90	+ }
	91	+
	92	+ Session::put('start', $userId);
	93	+ return json_encode([
	94	+ "location" => getenv('APP_URL')."/views/account.php"
	95	+ ]);
	96	+ }
	97	+ }
	98	+
	99	+
	100	+ public function onError($key, $value)
	101	+ {
	102	+ $this->flag = 1;
	103	+ $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
	104	+ }
	105	+
	106	+ public function emptyValue($data)
	107	+ {
	108	+ $errorCode = array(
	109	+ "name" => " *Enter the name",
	110	+ "email" => " *Enter the email address",
	111	+ "username" => " *Enter the username",
	112	+ "passRegister" => " *Enter the password",
	113	+ "mob" => " *Enter the Mobile Number"
	114	+ );
	115	+
	116	+ foreach ($data as $key => $value) {
	117	+ $data[$key] = trim($data[$key]);
	118	+ $value = trim($value);
	119	+ if(empty($value))
	120	+ {
	121	+ $this->onError($key, $errorCode[$key]);
	122	+ }
	123	+ }
	124	+ return $data;
	125	+ }
126	126	}

		@@ -2,7 +2,7 @@ discard block
		block discarded – undo
2	2
3	3	namespace ChatApp;
4	4
5		-require_once (dirname(__DIR__) . '/vendor/autoload.php');
	5	+require_once (dirname(__DIR__).'/vendor/autoload.php');
6	6	use ChatApp\Validate;
7	7	use ChatApp\Session;
8	8	use Dotenv\Dotenv;
		@@ -41,16 +41,16 @@ discard block
		block discarded – undo
41	41	$password = $data["passRegister"];
42	42	$userId = '';
43	43
44		- if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
	44	+ if (filter_var($email, FILTER_VALIDATE_EMAIL) == false)
45	45	{
46	46	$this->onError("email", " *Enter correct Email address");
47	47	}
48		- else if($this->obValidate->validateEmailInDb($email) === 1)
	48	+ else if ($this->obValidate->validateEmailInDb($email) === 1)
49	49	{
50	50	$this->onError("email", " *Email is already registered");
51	51	}
52	52
53		- if($this->obValidate->validateUsernameInDb($username) === 1)
	53	+ if ($this->obValidate->validateUsernameInDb($username) === 1)
54	54	{
55	55	$this->onError("username", " *Username is already registered");
56	56	}
		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	$this->onError("mob", " *Enter correct Mobile Number");
60	60	}
61	61
62		- if($this->flag == 1)
	62	+ if ($this->flag == 1)
63	63	{
64	64	return json_encode($this->error);
65	65	}
		@@ -67,26 +67,26 @@ discard block
		block discarded – undo
67	67	$password = md5($password);
68	68
69	69	$query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
70		- if(!$this->connect->query($query))
	70	+ if (!$this->connect->query($query))
71	71	{
72		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	72	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
73	73	}
74	74	$query = "SELECT id FROM register WHERE email = '$email'";
75		- if($result = $this->connect->query($query))
	75	+ if ($result = $this->connect->query($query))
76	76	{
77	77	$row = $result->fetch_assoc();
78	78	$userId = $row['id'];
79	79	$query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
80	80
81		- if(!$this->connect->query($query))
	81	+ if (!$this->connect->query($query))
82	82	{
83		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	83	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
84	84	}
85	85
86	86	$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
87		- if(!$this->connect->query($query))
	87	+ if (!$this->connect->query($query))
88	88	{
89		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	89	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
90	90	}
91	91
92	92	Session::put('start', $userId);
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	foreach ($data as $key => $value) {
117	117	$data[$key] = trim($data[$key]);
118	118	$value = trim($value);
119		- if(empty($value))
	119	+ if (empty($value))
120	120	{
121	121	$this->onError($key, $errorCode[$key]);
122	122	}

		@@ -44,8 +44,7 @@
		block discarded – undo
44	44	if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
45	45	{
46	46	$this->onError("email", " *Enter correct Email address");
47		- }
48		- else if($this->obValidate->validateEmailInDb($email) === 1)
	47	+ } else if($this->obValidate->validateEmailInDb($email) === 1)
49	48	{
50	49	$this->onError("email", " *Email is already registered");
51	50	}

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	namespace ChatApp;
4		-require_once (dirname(__DIR__) . '/vendor/autoload.php');
	4	+require_once (dirname(__DIR__).'/vendor/autoload.php');
5	5	use ChatApp\Session;
6	6	use Dotenv\Dotenv;
7	7	$dotenv = new Dotenv(dirname(__DIR__));
		@@ -37,13 +37,13 @@ discard block
		block discarded – undo
37	37
38	38	if (preg_match("/^[@]{1}$/", $login))
39	39	{
40		- if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
	40	+ if (filter_var($login, FILTER_VALIDATE_EMAIL) == false)
41	41	{
42	42	$this->onError("login", " *Enter correct Email address");
43	43	}
44	44	}
45	45
46		- if($this->flag == 0)
	46	+ if ($this->flag == 0)
47	47	{
48	48	$password = md5($password);
49	49	$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
		@@ -54,7 +54,7 @@ discard block
		block discarded – undo
54	54	$row = $result->fetch_assoc();
55	55	$loginID = $row['login_id'];
56	56	$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
57		- if($result = $this->connect->query($query))
	57	+ if ($result = $this->connect->query($query))
58	58	{
59	59	if ($result->num_rows > 0)
60	60	{
		@@ -66,12 +66,12 @@ discard block
		block discarded – undo
66	66	$this->onError("passLogin", " *Invalid password");
67	67	return json_encode($this->error);
68	68	}
69		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	69	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
70	70	}
71	71	$this->onError("login", " *Invalid username or email");
72	72	return json_encode($this->error);
73	73	}
74		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	74	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
75	75	}
76	76	else
77	77	{
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	foreach ($data as $key => $value) {
96	96	$data[$key] = trim($data[$key]);
97	97	$value = trim($value);
98		- if(empty($value))
	98	+ if (empty($value))
99	99	{
100	100	$this->onError($key, $errorCode[$key]);
101	101	}

		@@ -72,8 +72,7 @@
		block discarded – undo
72	72	return json_encode($this->error);
73	73	}
74	74	return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
75		- }
76		- else
	75	+ } else
77	76	{
78	77	return json_encode($this->error);
79	78	}

		@@ -11,96 +11,96 @@
		block discarded – undo
11	11	class Login
12	12	{
13	13
14		- protected $flag;
15		- protected $error;
16		- protected $connect;
	14	+ protected $flag;
	15	+ protected $error;
	16	+ protected $connect;
17	17
18		- public function __construct()
19		- {
20		- $this->flag = 0;
21		- $this->connect = mysqli_connect(
	18	+ public function __construct()
	19	+ {
	20	+ $this->flag = 0;
	21	+ $this->connect = mysqli_connect(
22	22	getenv('DB_HOST'),
23	23	getenv('DB_USER'),
24	24	getenv('DB_PASSWORD'),
25	25	getenv('DB_NAME')
26	26	);
27		- $this->error = array();
28		- }
	27	+ $this->error = array();
	28	+ }
29	29
30		- public function authLogin($data)
31		- {
32		- $data = $this->emptyValue($data);
	30	+ public function authLogin($data)
	31	+ {
	32	+ $data = $this->emptyValue($data);
33	33
34		- $login = $data["login"];
35		- $password = $data["passLogin"];
	34	+ $login = $data["login"];
	35	+ $password = $data["passLogin"];
36	36
37		- if (preg_match("/^.+[@]{1}.+$/", $login))
38		- {
39		- if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
40		- {
41		- $this->onError("login", " *Enter correct Email address");
42		- }
43		- }
	37	+ if (preg_match("/^.+[@]{1}.+$/", $login))
	38	+ {
	39	+ if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
	40	+ {
	41	+ $this->onError("login", " *Enter correct Email address");
	42	+ }
	43	+ }
44	44
45		- if($this->flag == 0)
46		- {
47		- $password = md5($password);
48		- $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
49		- if ($result = $this->connect->query($query))
50		- {
51		- if ($result->num_rows > 0)
52		- {
53		- $row = $result->fetch_assoc();
54		- $loginID = $row['login_id'];
55		- $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
56		- if($result = $this->connect->query($query))
57		- {
58		- if ($result->num_rows > 0)
59		- {
60		- Session::put('start', $loginID);
61		- return json_encode([
62		- "location" => getenv('APP_URL')."/views/account.php"
63		- ]);
64		- }
65		- $this->onError("passLogin", " *Invalid password");
66		- return json_encode($this->error);
67		- }
68		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
69		- }
70		- $this->onError("login", " *Invalid username or email");
71		- return json_encode($this->error);
72		- }
73		- return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
74		- }
75		- else
76		- {
77		- return json_encode($this->error);
78		- }
79		- }
	45	+ if($this->flag == 0)
	46	+ {
	47	+ $password = md5($password);
	48	+ $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
	49	+ if ($result = $this->connect->query($query))
	50	+ {
	51	+ if ($result->num_rows > 0)
	52	+ {
	53	+ $row = $result->fetch_assoc();
	54	+ $loginID = $row['login_id'];
	55	+ $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
	56	+ if($result = $this->connect->query($query))
	57	+ {
	58	+ if ($result->num_rows > 0)
	59	+ {
	60	+ Session::put('start', $loginID);
	61	+ return json_encode([
	62	+ "location" => getenv('APP_URL')."/views/account.php"
	63	+ ]);
	64	+ }
	65	+ $this->onError("passLogin", " *Invalid password");
	66	+ return json_encode($this->error);
	67	+ }
	68	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	69	+ }
	70	+ $this->onError("login", " *Invalid username or email");
	71	+ return json_encode($this->error);
	72	+ }
	73	+ return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
	74	+ }
	75	+ else
	76	+ {
	77	+ return json_encode($this->error);
	78	+ }
	79	+ }
80	80
81		- public function onError($key, $value)
82		- {
83		- $this->flag = 1;
84		- $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
85		- }
	81	+ public function onError($key, $value)
	82	+ {
	83	+ $this->flag = 1;
	84	+ $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]);
	85	+ }
86	86
87		- public function emptyValue($data)
88		- {
89		- $errorCode = array(
90		- "login" => " *Enter the login field",
91		- "passLogin" => " *Enter the password"
92		- );
	87	+ public function emptyValue($data)
	88	+ {
	89	+ $errorCode = array(
	90	+ "login" => " *Enter the login field",
	91	+ "passLogin" => " *Enter the password"
	92	+ );
93	93
94		- foreach ($data as $key => $value) {
95		- $data[$key] = trim($data[$key]);
96		- $value = trim($value);
97		- if(empty($value))
98		- {
99		- $this->onError($key, $errorCode[$key]);
100		- }
101		- }
102		- return $data;
103		- }
	94	+ foreach ($data as $key => $value) {
	95	+ $data[$key] = trim($data[$key]);
	96	+ $value = trim($value);
	97	+ if(empty($value))
	98	+ {
	99	+ $this->onError($key, $errorCode[$key]);
	100	+ }
	101	+ }
	102	+ return $data;
	103	+ }
104	104
105	105	}
106	106

		@@ -14,8 +14,9 @@
		block discarded – undo
14	14	'passLogin' => $password
15	15	);
16	16	$result = $obLogin->authLogin($data);
17		- if(isset($result))
18		- echo $result;
19		- else
20		- echo json_encode([]);
21		-}
22	17	\ No newline at end of file
	18	+ if(isset($result)) {
	19	+ echo $result;
	20	+ } else {
	21	+ echo json_encode([]);
	22	+ }
	23	+ }
23	24	\ No newline at end of file

		@@ -51,9 +51,9 @@ discard block
		block discarded – undo
51	51	}
52	52
53	53	/**
54		- * @depends test_authRegister
55		- * Testing for the register with empty username
56		- */
	54	+ * @depends test_authRegister
	55	+ * Testing for the register with empty username
	56	+ */
57	57	public function test_authregisterEmptyUsername()
58	58	{
59	59	$output = $this->obRegister->authregister(
		@@ -77,9 +77,9 @@ discard block
		block discarded – undo
77	77	}
78	78
79	79	/**
80		- * @depends test_authRegister
81		- * Testing for the register with invalid email credentials
82		- */
	80	+ * @depends test_authRegister
	81	+ * Testing for the register with invalid email credentials
	82	+ */
83	83	public function test_authregisterInvalidEmail()
84	84	{
85	85	$output = $this->obRegister->authregister(
		@@ -103,9 +103,9 @@ discard block
		block discarded – undo
103	103	}
104	104
105	105	/**
106		- * @depends test_authRegister
107		- * Testing for the register with repeated credentials
108		- */
	106	+ * @depends test_authRegister
	107	+ * Testing for the register with repeated credentials
	108	+ */
109	109	public function test_authregisterInvalidCredentials()
110	110	{
111	111	$output = $this->obRegister->authregister(
		@@ -137,9 +137,9 @@ discard block
		block discarded – undo
137	137	}
138	138
139	139	/**
140		- * @depends test_authRegister
141		- * Testing for the login with correct credentials
142		- */
	140	+ * @depends test_authRegister
	141	+ * Testing for the login with correct credentials
	142	+ */
143	143
144	144	public function test_authLogin()
145	145	{
		@@ -163,9 +163,9 @@ discard block
		block discarded – undo
163	163	}
164	164
165	165	/**
166		- * @depends test_authRegister
167		- * Testing for the login with empty credentials
168		- */
	166	+ * @depends test_authRegister
	167	+ * Testing for the login with empty credentials
	168	+ */
169	169
170	170	public function test_authLoginEmptyValues()
171	171	{
		@@ -191,9 +191,9 @@ discard block
		block discarded – undo
191	191	}
192	192
193	193	/**
194		- * @depends test_authRegister
195		- * Testing for the login with invalid or wrong email
196		- */
	194	+ * @depends test_authRegister
	195	+ * Testing for the login with invalid or wrong email
	196	+ */
197	197
198	198	public function test_authLoginWrongEmail()
199	199	{
		@@ -215,9 +215,9 @@ discard block
		block discarded – undo
215	215	}
216	216
217	217	/**
218		- * @depends test_authRegister
219		- * Testing for the login with invalid email credentials
220		- */
	218	+ * @depends test_authRegister
	219	+ * Testing for the login with invalid email credentials
	220	+ */
221	221	public function test_authLoginInvalidUsernameEmail()
222	222	{
223	223	$output = $this->obLogin->authLogin(
		@@ -238,9 +238,9 @@ discard block
		block discarded – undo
238	238	}
239	239
240	240	/**
241		- * @depends test_authRegister
242		- * Testing for the login with invalid password credentials
243		- */
	241	+ * @depends test_authRegister
	242	+ * Testing for the login with invalid password credentials
	243	+ */
244	244	public function test_authLoginInvalidPassword()
245	245	{
246	246	$output = $this->obLogin->authLogin(
		@@ -260,9 +260,9 @@ discard block
		block discarded – undo
260	260	}
261	261
262	262	/**
263		- * @depends test_authRegister
264		- * Testing for the Profile::class with valid login_id
265		- */
	263	+ * @depends test_authRegister
	264	+ * Testing for the Profile::class with valid login_id
	265	+ */
266	266	public function test_getProfile()
267	267	{
268	268	$output = Profile::getProfile(1);
		@@ -275,9 +275,9 @@ discard block
		block discarded – undo
275	275	}
276	276
277	277	/**
278		- * @depends test_authRegister
279		- * Testing for the Profile::class with invalid login_id
280		- */
	278	+ * @depends test_authRegister
	279	+ * Testing for the Profile::class with invalid login_id
	280	+ */
281	281	public function test_getProfileInvalidID()
282	282	{
283	283	$output = Profile::getProfile(0);
		@@ -285,9 +285,9 @@ discard block
		block discarded – undo
285	285	}
286	286
287	287	/**
288		- * @depends test_authRegister
289		- * Testing for the User::class with valid login_id
290		- */
	288	+ * @depends test_authRegister
	289	+ * Testing for the User::class with valid login_id
	290	+ */
291	291	public function test_userDetails()
292	292	{
293	293	$expectedOutput = [
		@@ -306,9 +306,9 @@ discard block
		block discarded – undo
306	306	}
307	307
308	308	/**
309		- * @depends test_authRegister
310		- * Testing for the User::class with invalid data
311		- */
	309	+ * @depends test_authRegister
	310	+ * Testing for the User::class with invalid data
	311	+ */
312	312	public function test_userDetailsInvalidID()
313	313	{
314	314	$output = $this->obUser->userDetails(0, True);
		@@ -316,9 +316,9 @@ discard block
		block discarded – undo
316	316	}
317	317
318	318	/**
319		- * @depends test_authRegister
320		- * Testing for the Validate::class for email
321		- */
	319	+ * @depends test_authRegister
	320	+ * Testing for the Validate::class for email
	321	+ */
322	322	public function test_validateEmailInDb()
323	323	{
324	324	$output = $this->obValidate->validateEmailInDb('[email protected]');
		@@ -326,9 +326,9 @@ discard block
		block discarded – undo
326	326	}
327	327
328	328	/**
329		- * @depends test_authRegister
330		- * Testing for the Validate::class for username
331		- */
	329	+ * @depends test_authRegister
	330	+ * Testing for the Validate::class for username
	331	+ */
332	332	public function test_validateUsernameInDb()
333	333	{
334	334	$output = $this->obValidate->validateUsernameInDb('test');
		@@ -336,9 +336,9 @@ discard block
		block discarded – undo
336	336	}
337	337
338	338	/**
339		- * @depends test_authRegister
340		- * Testing for the Validate::class for non-existing username
341		- */
	339	+ * @depends test_authRegister
	340	+ * Testing for the Validate::class for non-existing username
	341	+ */
342	342	public function test_validateUsernameInDbNot()
343	343	{
344	344	$output = $this->obValidate->validateUsernameInDb('abc');
		@@ -346,9 +346,9 @@ discard block
		block discarded – undo
346	346	}
347	347
348	348	/**
349		- * @depends test_authRegister
350		- * Testing for the Validate::class for non-existing email
351		- */
	349	+ * @depends test_authRegister
	350	+ * Testing for the Validate::class for non-existing email
	351	+ */
352	352	public function test_validateEmailInDbNot()
353	353	{
354	354	$output = $this->obValidate->validateEmailInDb('[email protected]');
		@@ -356,9 +356,9 @@ discard block
		block discarded – undo
356	356	}
357	357
358	358	/**
359		- * @depends test_authRegister
360		- * Testing for the Online::class
361		- */
	359	+ * @depends test_authRegister
	360	+ * Testing for the Online::class
	361	+ */
362	362	public function test_Online()
363	363	{
364	364	Online::setOnlineStatus(1);
		@@ -373,9 +373,9 @@ discard block
		block discarded – undo
373	373
374	374
375	375	/**
376		- * @depends test_Online
377		- * Empty the DB
378		- */
	376	+ * @depends test_Online
	377	+ * Empty the DB
	378	+ */
379	379	public function test_EmptyDB()
380	380	{
381	381	$connect = mysqli_connect(

		@@ -8,7 +8,6 @@
		block discarded – undo
8	8	use ChatApp\Compose;
9	9	use ChatApp\Reply;
10	10	use ChatApp\Session;
11		-
12	11	use Dotenv\Dotenv;
13	12	$dotenv = new Dotenv(dirname(__DIR__));
14	13	$dotenv->load();

		@@ -48,9 +48,9 @@ discard block
		block discarded – undo
48	48	}
49	49
50	50	/**
51		- * @depends testAuthRegister
52		- * Register User2
53		- */
	51	+ * @depends testAuthRegister
	52	+ * Register User2
	53	+ */
54	54	public function testAuthRegister2()
55	55	{
56	56	$output = $this->obRegister->authRegister(
		@@ -73,9 +73,9 @@ discard block
		block discarded – undo
73	73	}
74	74
75	75	/**
76		- * @depends testAuthRegister2
77		- * Testing for the register with empty username
78		- */
	76	+ * @depends testAuthRegister2
	77	+ * Testing for the register with empty username
	78	+ */
79	79	public function testCompose()
80	80	{
81	81	$expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
		@@ -129,9 +129,9 @@ discard block
		block discarded – undo
129	129	}
130	130
131	131	/**
132		- * @depends testAuthRegister2
133		- * Testing for Search Class
134		- */
	132	+ * @depends testAuthRegister2
	133	+ * Testing for Search Class
	134	+ */
135	135	public function testSearch($userId)
136	136	{
137	137	$expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
		@@ -170,9 +170,9 @@ discard block
		block discarded – undo
170	170	}
171	171
172	172	/**
173		- * @depends testAuthRegister2
174		- * Testing for Reply Class
175		- */
	173	+ * @depends testAuthRegister2
	174	+ * Testing for Reply Class
	175	+ */
176	176	public function testReply($userId)
177	177	{
178	178	$msg = [
		@@ -223,9 +223,9 @@ discard block
		block discarded – undo
223	223	}
224	224
225	225	/**
226		- * @depends testAuthRegister2
227		- * Testing for Search Class
228		- */
	226	+ * @depends testAuthRegister2
	227	+ * Testing for Search Class
	228	+ */
229	229	public function testSearchWithTotalMessages($userId)
230	230	{
231	231	$expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php'];
		@@ -251,9 +251,9 @@ discard block
		block discarded – undo
251	251
252	252
253	253	/**
254		- * @depends testSearchWithTotalMessages
255		- * Empty the DB
256		- */
	254	+ * @depends testSearchWithTotalMessages
	255	+ * Empty the DB
	256	+ */
257	257	public function test_EmptyDB()
258	258	{
259	259	$connect = mysqli_connect(

ankitjain28may / openchat

Push — master ( 5e0cf4...450790 )

Status

Category

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +22 added lines, -22 removed lines patch added patch discarded remove patch

Braces +31 added lines, -22 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +19 added lines, -19 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch

Indentation +106 added lines, -106 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +1 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +77 added lines, -77 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +54 added lines, -54 removed lines patch added patch discarded remove patch

Unused Use Statements -1 removed lines patch added patch discarded remove patch

Indentation +18 added lines, -18 removed lines patch added patch discarded remove patch