Inspection of "Directory structure and online status" - ankitjain28may/openchat - Measure and Improve Code Quality continuously with Scrutinizer

Test Setup Failed

Push — master ( a87e27...976b69 )

by Ankit

created 2017-01-02 16:56 UTC

Status

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

@@ -12,26 +12,26 @@  discard block
 block discarded – undo
 $userId = $session->get('start');
 if($userId != null and $user == "account.php")
 {
-	$obUser = new User();
-	$row = $obUser->UserDetails($userId, True);
+    $obUser = new User();
+    $row = $obUser->UserDetails($userId, True);
 
-	if($row != NULL)
-	{
-		$location = URL . "/account.php/". $row['username'];
-		header("Location:".$location);
-	}
+    if($row != NULL)
+    {
+        $location = URL . "/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:".URL."/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:".URL."/error.php");
 ?>
 
 		<!Doctype html>
@@ -66,18 +66,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' and $value != null)
-									echo '<p>Username: '.$row["username"] .'</p><br>';
-								if($key == 'email' and $value != null)
-									echo '<p>Email Id: '.$row["email"] .'</p><br>';
-								if($key == 'status' and $value != null)
-									echo '<p>Status: '.$row["status"] .'</p><br>';
-								if($key == 'education' and $value != null)
-									echo '<p>Education: '.$row["education"] .'</p><br>';
-								if($key == 'gender' and $value != null)
-									echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
-							}
-							?>
+                                if($key =='username' and $value != null)
+                                    echo '<p>Username: '.$row["username"] .'</p><br>';
+                                if($key == 'email' and $value != null)
+                                    echo '<p>Email Id: '.$row["email"] .'</p><br>';
+                                if($key == 'status' and $value != null)
+                                    echo '<p>Status: '.$row["status"] .'</p><br>';
+                                if($key == 'education' and $value != null)
+                                    echo '<p>Education: '.$row["education"] .'</p><br>';
+                                if($key == 'gender' and $value != null)
+                                    echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+                            }
+                            ?>
 						</div>
 						<?php if($session->get('start') == $row['login_id']): ?>
 							<div class="edit">
@@ -87,8 +87,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">
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
 						</form>
 					</div>
 					<?php
-						endif;
-					?>
+                        endif;
+                    ?>
 				</div>
 
 				<div class="footer">
@@ -117,13 +117,13 @@  discard block
 block discarded – undo
 			</body>
 		</html>
 <?php
-	else:
-		header("Location:".URL."/error.php");
-	endif;
+    else:
+        header("Location:".URL."/error.php");
+    endif;
 }
 else
 {
-	header("Location: ".URL);
+    header("Location: ".URL);
 }
 ?>
 

Please login to merge, or discard this patch.

message.php 1 patch

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

@@ -131,6 +131,6 @@
 block discarded – undo
 <?php
 }
 else{
-	header('Location:http://localhost/openchat');
+    header('Location:http://localhost/openchat');
 }
 ?>

Please login to merge, or discard this patch.

src/Login.php 1 patch

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

@@ -7,85 +7,85 @@
 block discarded – undo
 class Login
 {
 
-	protected $key;
-	protected $error;
-	protected $connect;
-	protected $session;
+    protected $key;
+    protected $error;
+    protected $connect;
+    protected $session;
 
-	public function __construct()
-	{
-		$this->key = 0;
-		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-		$this->error = array();
-		$this->session = new Session();
-	}
+    public function __construct()
+    {
+        $this->key = 0;
+        $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+        $this->error = array();
+        $this->session = new Session();
+    }
 
-	public function authLogin($login, $password)
-	{
+    public function authLogin($login, $password)
+    {
 
-		$login = trim($login);
-		$password = trim($password);
+        $login = trim($login);
+        $password = trim($password);
 
-		if(empty($login))
-		{
-			$this->key = 1;
-			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
-		}
-		elseif (preg_match("/^[@]{1}$/", $login))
-		{
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
-			{
-			$this->key = 1;
-			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
-			}
-		}
-		if(empty($password)) {
-			$this->key = 1;
-			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
-		}
-		else
-		{
-			$password = md5($password);
-		}
+        if(empty($login))
+        {
+            $this->key = 1;
+            $this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
+        }
+        elseif (preg_match("/^[@]{1}$/", $login))
+        {
+            if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
+            {
+            $this->key = 1;
+            $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
+            }
+        }
+        if(empty($password)) {
+            $this->key = 1;
+            $this->error = array_merge($this->error, ["password" => " *Enter the password"]);
+        }
+        else
+        {
+            $password = md5($password);
+        }
 
-		if($this->key == 0)
-		{
-			$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)
-						{
-							$this->session->put('start', $loginID);
-							return json_encode([
-								"location" => URL."/account.php"
-							]);
-						}
-						else
-						{
-							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
-							return json_encode($this->error);
-						}
-					}
-				}
-				else
-				{
-					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
-					return json_encode($this->error);
-				}
-			}
+        if($this->key == 0)
+        {
+            $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)
+                        {
+                            $this->session->put('start', $loginID);
+                            return json_encode([
+                                "location" => URL."/account.php"
+                            ]);
+                        }
+                        else
+                        {
+                            $this->error = array_merge($this->error, ["password" => " *Invalid password"]);
+                            return json_encode($this->error);
+                        }
+                    }
+                }
+                else
+                {
+                    $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
+                    return json_encode($this->error);
+                }
+            }
 
-		}
-		else
-		{
-			return json_encode($this->error);
-		}
-		$this->connect->close();
-	}
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+        $this->connect->close();
+    }
 }

Please login to merge, or discard this patch.

src/Register.php 1 patch

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

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

Please login to merge, or discard this patch.

src/Validate.php 1 patch

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

@@ -4,35 +4,35 @@
 block discarded – undo
 
 class Validate
 {
-	protected $connect;
+    protected $connect;
 
-	public function __construct()
-	{
-		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-	}
+    public function __construct()
+    {
+        $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, 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;
+        }
+    }
 }

Please login to merge, or discard this patch.

ajax/validate_login.php 1 patch

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

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

Please login to merge, or discard this patch.

ajax/validate_register.php 1 patch

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

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

Please login to merge, or discard this patch.

		@@ -131,6 +131,6 @@
		block discarded – undo
131	131	<?php
132	132	}
133	133	else{
134		- header('Location:http://localhost/openchat');
	134	+ header('Location:http://localhost/openchat');
135	135	}
136	136	?>

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

		@@ -7,85 +7,85 @@
		block discarded – undo
7	7	class Login
8	8	{
9	9
10		- protected $key;
11		- protected $error;
12		- protected $connect;
13		- protected $session;
	10	+ protected $key;
	11	+ protected $error;
	12	+ protected $connect;
	13	+ protected $session;
14	14
15		- public function __construct()
16		- {
17		- $this->key = 0;
18		- $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
19		- $this->error = array();
20		- $this->session = new Session();
21		- }
	15	+ public function __construct()
	16	+ {
	17	+ $this->key = 0;
	18	+ $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
	19	+ $this->error = array();
	20	+ $this->session = new Session();
	21	+ }
22	22
23		- public function authLogin($login, $password)
24		- {
	23	+ public function authLogin($login, $password)
	24	+ {
25	25
26		- $login = trim($login);
27		- $password = trim($password);
	26	+ $login = trim($login);
	27	+ $password = trim($password);
28	28
29		- if(empty($login))
30		- {
31		- $this->key = 1;
32		- $this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
33		- }
34		- elseif (preg_match("/^[@]{1}$/", $login))
35		- {
36		- if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
37		- {
38		- $this->key = 1;
39		- $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
40		- }
41		- }
42		- if(empty($password)) {
43		- $this->key = 1;
44		- $this->error = array_merge($this->error, ["password" => " *Enter the password"]);
45		- }
46		- else
47		- {
48		- $password = md5($password);
49		- }
	29	+ if(empty($login))
	30	+ {
	31	+ $this->key = 1;
	32	+ $this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
	33	+ }
	34	+ elseif (preg_match("/^[@]{1}$/", $login))
	35	+ {
	36	+ if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
	37	+ {
	38	+ $this->key = 1;
	39	+ $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
	40	+ }
	41	+ }
	42	+ if(empty($password)) {
	43	+ $this->key = 1;
	44	+ $this->error = array_merge($this->error, ["password" => " *Enter the password"]);
	45	+ }
	46	+ else
	47	+ {
	48	+ $password = md5($password);
	49	+ }
50	50
51		- if($this->key == 0)
52		- {
53		- $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
54		- if ($result = $this->connect->query($query))
55		- {
56		- if ($result->num_rows > 0)
57		- {
58		- $row = $result->fetch_assoc();
59		- $loginID = $row['login_id'];
60		- $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
61		- if($result = $this->connect->query($query))
62		- {
63		- if ($result->num_rows > 0)
64		- {
65		- $this->session->put('start', $loginID);
66		- return json_encode([
67		- "location" => URL."/account.php"
68		- ]);
69		- }
70		- else
71		- {
72		- $this->error = array_merge($this->error, ["password" => " *Invalid password"]);
73		- return json_encode($this->error);
74		- }
75		- }
76		- }
77		- else
78		- {
79		- $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
80		- return json_encode($this->error);
81		- }
82		- }
	51	+ if($this->key == 0)
	52	+ {
	53	+ $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
	54	+ if ($result = $this->connect->query($query))
	55	+ {
	56	+ if ($result->num_rows > 0)
	57	+ {
	58	+ $row = $result->fetch_assoc();
	59	+ $loginID = $row['login_id'];
	60	+ $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
	61	+ if($result = $this->connect->query($query))
	62	+ {
	63	+ if ($result->num_rows > 0)
	64	+ {
	65	+ $this->session->put('start', $loginID);
	66	+ return json_encode([
	67	+ "location" => URL."/account.php"
	68	+ ]);
	69	+ }
	70	+ else
	71	+ {
	72	+ $this->error = array_merge($this->error, ["password" => " *Invalid password"]);
	73	+ return json_encode($this->error);
	74	+ }
	75	+ }
	76	+ }
	77	+ else
	78	+ {
	79	+ $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
	80	+ return json_encode($this->error);
	81	+ }
	82	+ }
83	83
84		- }
85		- else
86		- {
87		- return json_encode($this->error);
88		- }
89		- $this->connect->close();
90		- }
	84	+ }
	85	+ else
	86	+ {
	87	+ return json_encode($this->error);
	88	+ }
	89	+ $this->connect->close();
	90	+ }
91	91	}

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

		@@ -4,35 +4,35 @@
		block discarded – undo
4	4
5	5	class Validate
6	6	{
7		- protected $connect;
	7	+ protected $connect;
8	8
9		- public function __construct()
10		- {
11		- $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
12		- }
	9	+ public function __construct()
	10	+ {
	11	+ $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
	12	+ }
13	13
14		- public function validateEmailInDb($email)
15		- {
16		- $query = "SELECT login_id FROM login WHERE email = '$email'";
17		- if ($result = $this->connect->query($query))
18		- {
19		- if ($result->num_rows > 0) {
20		- return 1;
21		- }
22		- else
23		- return 0;
24		- }
25		- }
	14	+ public function validateEmailInDb($email)
	15	+ {
	16	+ $query = "SELECT login_id FROM login WHERE email = '$email'";
	17	+ if ($result = $this->connect->query($query))
	18	+ {
	19	+ if ($result->num_rows > 0) {
	20	+ return 1;
	21	+ }
	22	+ else
	23	+ return 0;
	24	+ }
	25	+ }
26	26
27		- function validateUsernameInDb($username)
28		- {
29		- $query = "SELECT login_id FROM login WHERE username = '$username'";
30		- if ($result = $this->connect->query($query)) {
31		- if ($result->num_rows > 0) {
32		- return 1;
33		- }
34		- else
35		- return 0;
36		- }
37		- }
	27	+ function validateUsernameInDb($username)
	28	+ {
	29	+ $query = "SELECT login_id FROM login WHERE username = '$username'";
	30	+ if ($result = $this->connect->query($query)) {
	31	+ if ($result->num_rows > 0) {
	32	+ return 1;
	33	+ }
	34	+ else
	35	+ return 0;
	36	+ }
	37	+ }
38	38	}

		@@ -5,13 +5,13 @@
		block discarded – undo
5	5
6	6	if(isset($_POST['q']))
7	7	{
8		- $loginField = json_decode($_POST['q']);
9		- $login = $loginField->login;
10		- $password = $loginField->password;
11		- $obLogin = new Login();
12		- $result = $obLogin->authLogin($login, $password);
13		- if(isset($result))
14		- echo $result;
15		- else
16		- echo json_encode([]);
	8	+ $loginField = json_decode($_POST['q']);
	9	+ $login = $loginField->login;
	10	+ $password = $loginField->password;
	11	+ $obLogin = new Login();
	12	+ $result = $obLogin->authLogin($login, $password);
	13	+ if(isset($result))
	14	+ echo $result;
	15	+ else
	16	+ echo json_encode([]);
17	17	}
18	18	\ No newline at end of file

		@@ -5,17 +5,17 @@
		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		- $result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16		- if(isset($result))
17		- echo $result;
18		- else
19		- 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	+ $result = $obRegister->authRegister($name, $email, $username, $password, $mob);
	16	+ if(isset($result))
	17	+ echo $result;
	18	+ else
	19	+ echo json_encode([]);
20	20	}
21	21

ankitjain28may / openchat

Push — master ( a87e27...976b69 )

Status

Category

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

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

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

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

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

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

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