ankitjain28may / openchat

src/Models/message.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class Message extends Model
 {
-    protected $table='message';
+    protected $table = 'message';
 
     protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time'];
 }

src/User.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 
 /**
 * For retreiving User Information
@@ -21,12 +21,12 @@ 
 
     function UserDetails($id, $para)
     {
-        if($para == True)
+        if ($para == True)
             $this->query = "SELECT * from login where login_id = '$id'";
         else
             $this->query = "SELECT * from login where username = '$id'";
         $this->result = $this->connect->query($this->query);
-        if($this->result->num_rows > 0)                   // if true
+        if ($this->result->num_rows > 0)                   // if true
         {
             $this->details = $this->result->fetch_assoc();
             return $this->details;

Braces +9 added lines, -7 removed lines

@@ -21,17 +21,19 @@
 
     function UserDetails($id, $para)
     {
-        if($para == True)
-            $this->query = "SELECT * from login where login_id = '$id'";
-        else
-            $this->query = "SELECT * from login where username = '$id'";
+        if($para == True) {
+                    $this->query = "SELECT * from login where login_id = '$id'";
+        } else {
+                    $this->query = "SELECT * from login where username = '$id'";
+        }
         $this->result = $this->connect->query($this->query);
-        if($this->result->num_rows > 0)                   // if true
+        if($this->result->num_rows > 0) {
+            // if true
         {
             $this->details = $this->result->fetch_assoc();
-            return $this->details;
         }
-        else
+            return $this->details;
+        } else
         {
             return NULL;
         }

src/Conversation.php

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\Time;
 use ChatApp\User;
 
@@ -30,7 +30,7 @@ 
     {
 
         $flag = 1;
-        if(isset($_SESSION['start']) && isset($msg))
+        if (isset($_SESSION['start']) && isset($msg))
         {
             $add_load = 0;
             $id = $_SESSION['start'];
@@ -40,25 +40,25 @@ 
 
             $fetch = $this->obUser->UserDetails($username, $para);
 
-            if($fetch != NULL)
+            if ($fetch != NULL)
             {
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $id)
+                if ($login_id > $id)
                     $identifier = $id.':'.$login_id;
                 else
                     $identifier = $login_id.':'.$id;
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
                         $total = $result->fetch_assoc();
                         $total = $total['total_messages'];
-                        if($total - $load > 0)
-                            if($total - $load > 10)
+                        if ($total - $load > 0)
+                            if ($total - $load > 10)
                                 $add_load = $load + 10;
                             else
                                 $add_load = $total;
@@ -66,14 +66,14 @@ 
                 }
 
                 $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load;
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
-                        while($row = $result->fetch_assoc())
+                        while ($row = $result->fetch_assoc())
                         {
                             $row['time'] = $this->obTime->TimeConversion($row['time']);
-                            $row = array_merge($row,['start' => $id]);
+                            $row = array_merge($row, ['start' => $id]);
                             $this->array = array_merge($this->array, [$row]);
                         }
 

Braces +14 added lines, -16 removed lines

@@ -45,10 +45,11 @@ 
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $id)
-                    $identifier = $id.':'.$login_id;
-                else
-                    $identifier = $login_id.':'.$id;
+                if($login_id > $id) {
+                                    $identifier = $id.':'.$login_id;
+                } else {
+                                    $identifier = $login_id.':'.$id;
+                }
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
                 if($result = $this->connect->query($query))
@@ -57,11 +58,12 @@ 
                     {
                         $total = $result->fetch_assoc();
                         $total = $total['total_messages'];
-                        if($total - $load > 0)
-                            if($total - $load > 10)
+                        if($total - $load > 0) {
+                                                    if($total - $load > 10)
                                 $add_load = $load + 10;
-                            else
-                                $add_load = $total;
+                        } else {
+                                                            $add_load = $total;
+                            }
                     }
                 }
 
@@ -79,23 +81,19 @@ 
 
                         $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'type' => 1]], $this->array);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'type' => 0]]);
                     }
-                }
-                else
+                } else
                 {
                     echo "Query Failed";
                 }
-            }
-            else
+            } else
             {
                 echo "Query Failed";
             }
-        }
-        else
+        } else
         {
             header('Location:../login.php');
         }

src/Search.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\Time;
 
 /**
@@ -28,24 +28,24 @@ 
     {
         $suggestion = $suggestion->value;
         $flag = 0;
-        if(isset($_SESSION['start']) && isset($suggestion))
+        if (isset($_SESSION['start']) && isset($suggestion))
         {
             $id = $_SESSION['start'];
             $suggestion = trim($suggestion);
-            if($suggestion != "")
+            if ($suggestion != "")
             {
                 $query = "SELECT * FROM login where login_id != '$id' and name like '$suggestion%' ORDER BY name ASC";
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
-                        while($row = $result->fetch_assoc())
+                        while ($row = $result->fetch_assoc())
                         {
                             $check_id = $row["login_id"];
                             $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$id') or (user2 = '$check_id' and user1 = '$id')";
-                            if($result1 = $this->connect->query($query))
+                            if ($result1 = $this->connect->query($query))
                             {
-                                if($result1->num_rows > 0)
+                                if ($result1->num_rows > 0)
                                 {
                                     $fetch = $result1->fetch_assoc();
                                     $fetch['time'] = $this->obTime->TimeConversion($fetch['time']);
@@ -57,7 +57,7 @@ 
                         }
                     }
                 }
-                if($flag != 0)
+                if ($flag != 0)
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);

Braces +4 added lines, -6 removed lines

@@ -61,16 +61,14 @@
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);
+                } else {
+                                    return json_encode(["Search" => "Not Found"]);
                 }
-                else
-                    return json_encode(["Search" => "Not Found"]);
-            }
-            else
+            } else
             {
                 return json_encode(["Search" => "Not Found"]);
             }
-        }
-        else
+        } else
         {
             return json_encode(["Search" => "Not Found"]);
         }

cmd.php

Indentation +9 added lines, -9 removed lines

@@ -8,16 +8,16 @@
 use ChatApp\Chat;
 
 $server =IoServer::factory(
-	new HttpServer(
-		new WsServer(
-			new Chat()
-			)
-		)
-	,
-	8080
-	);
+    new HttpServer(
+        new WsServer(
+            new Chat()
+            )
+        )
+    ,
+    8080
+    );
 $server->run();
 
 
 
- ?>
\ No newline at end of file
+    ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Ratchet\WebSocket\WsServer;
 use ChatApp\Chat;
 
-$server =IoServer::factory(
+$server = IoServer::factory(
 	new HttpServer(
 		new WsServer(
 			new Chat()

message.php

Indentation +1 added lines, -1 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 session_start();
-if(isset($_SESSION['start']) and empty($_GET['user']))
+if (isset($_SESSION['start']) and empty($_GET['user']))
 {
 ?>
 <!DOCTYPE html>
@@ -130,7 +130,7 @@ 
 
 <?php
 }
-else{
+else {
 	header('Location:http://www.localhost/openchat/login.php');
 }
 ?>

Braces +1 added lines, -2 removed lines

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

registration-module/ajax/validate_register.php

Indentation +12 added lines, -12 removed lines

@@ -3,17 +3,17 @@
 require_once '../source/class.register.php';
 if(isset($_POST['q']))
 {
-	$register_field=json_decode($_POST['q']);
-	$name=$register_field->name;
-	$email=$register_field->email;
-	$username=$register_field->username;
-	$mob=$register_field->mob;
-	$password=$register_field->password;
-	$ob = new register();
-	$result=$ob->_register($name,$email,$username,$password,$mob);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
+    $register_field=json_decode($_POST['q']);
+    $name=$register_field->name;
+    $email=$register_field->email;
+    $username=$register_field->username;
+    $mob=$register_field->mob;
+    $password=$register_field->password;
+    $ob = new register();
+    $result=$ob->_register($name,$email,$username,$password,$mob);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
 ?>
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -1,17 +1,17 @@
 <?php
 session_start();
 require_once '../source/class.register.php';
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
-	$register_field=json_decode($_POST['q']);
-	$name=$register_field->name;
-	$email=$register_field->email;
-	$username=$register_field->username;
-	$mob=$register_field->mob;
-	$password=$register_field->password;
+	$register_field = json_decode($_POST['q']);
+	$name = $register_field->name;
+	$email = $register_field->email;
+	$username = $register_field->username;
+	$mob = $register_field->mob;
+	$password = $register_field->password;
 	$ob = new register();
-	$result=$ob->_register($name,$email,$username,$password,$mob);
-	if(isset($result))
+	$result = $ob->_register($name, $email, $username, $password, $mob);
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

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

registration-module/ajax/validate_login.php

Indentation +9 added lines, -9 removed lines

@@ -3,14 +3,14 @@
 require_once '../source/class.login.php';
 if(isset($_POST['q']))
 {
-	$login_field=json_decode($_POST['q']);
-	$login=$login_field->login;
-	$password=$login_field->password;
-	$ob = new login();
-	$result=$ob->_login($login,$password);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
+    $login_field=json_decode($_POST['q']);
+    $login=$login_field->login;
+    $password=$login_field->password;
+    $ob = new login();
+    $result=$ob->_login($login,$password);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -1,14 +1,14 @@
 <?php
 session_start();
 require_once '../source/class.login.php';
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
-	$login_field=json_decode($_POST['q']);
-	$login=$login_field->login;
-	$password=$login_field->password;
+	$login_field = json_decode($_POST['q']);
+	$login = $login_field->login;
+	$password = $login_field->password;
 	$ob = new login();
-	$result=$ob->_login($login,$password);
-	if(isset($result))
+	$result = $ob->_login($login, $password);
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

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

registration-module/source/class.register.php

Indentation +132 added lines, -132 removed lines

@@ -5,36 +5,36 @@ 
 
 class register
 {
-	private $array_error;
-	private $name;
-	private $email;
-	private $username;
-	private $password;
-	private $mob;
-	private $key;
-	private $ob;
-	private $connect;
-
-	function __construct()
-	{
-		$this->array_error=array();
-		$this->key=0;
-		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-		$this->ob=new validate();
-
-
-		$query="CREATE TABLE IF NOT EXISTS register (
+    private $array_error;
+    private $name;
+    private $email;
+    private $username;
+    private $password;
+    private $mob;
+    private $key;
+    private $ob;
+    private $connect;
+
+    function __construct()
+    {
+        $this->array_error=array();
+        $this->key=0;
+        $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+        $this->ob=new validate();
+
+
+        $query="CREATE TABLE IF NOT EXISTS register (
 			id int primary key auto_increment unique not null,
 			email varchar(255) unique not null,
 			username varchar(255) unique not null,
 			password varchar(255) not null
 			) ENGINE=INNODB;";
 
-		if (!$this->connect->query($query)) {
-			echo "Table is not created || Query failed";
-		}
+        if (!$this->connect->query($query)) {
+            echo "Table is not created || Query failed";
+        }
 
-			$query="CREATE TABLE IF NOT EXISTS login (
+            $query="CREATE TABLE IF NOT EXISTS login (
 			login_id int primary key not null,
 			name varchar(255) not null,
 			email varchar(255) unique not null,
@@ -44,121 +44,121 @@ 
 			FOREIGN KEY (login_id) REFERENCES register(id)
 			) ENGINE=INNODB;";
 
-		if (!$this->connect->query($query)) {
-			echo "Table is not created || Query failed";
-		}
+        if (!$this->connect->query($query)) {
+            echo "Table is not created || Query failed";
+        }
 
-		$query="CREATE TABLE IF NOT EXISTS profile (
+        $query="CREATE TABLE IF NOT EXISTS profile (
 		login_id int primary key not null unique,
 		status text,
 		education text,
 		gender varchar(10)
 		) ENGINE=INNODB;";
 
-		if (!$this->connect->query($query)) {
-			echo "Table is not created || Query failed";
-		}
-
-	}
-
-	function _register($name,$email,$username,$password,$mob)
-	{
-		$this->name=trim($name);
-		$this->email=trim($email);
-		$this->username=trim($username);
-		$this->password=trim($password);
-		$this->mob=trim($mob);
-		if (empty($this->name)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["name"=>"Enter the name"]);
-		}
-
-		if(empty($this->email)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["email"=>"Enter the email address"]);
-		}
-		elseif(filter_var($this->email,FILTER_VALIDATE_EMAIL)== false) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["email"=>"Enter correct Email address"]);
-		}
-		else
-		{
-			if($this->ob->validate_email_in_db($this->email))
-			{
-				$this->key=1;
-				$this->array_error=array_merge($this->array_error,["email"=>"Email is already registered"]);
-			}
-		}
-
-		if(empty($this->username)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["username"=>"Enter the username"]);
-		}
-		else
-		{
-			if($this->ob->validate_username_in_db($this->username))
-			{
-				$this->key=1;
-				$this->array_error=array_merge($this->array_error,["username"=>"Username is already registered"]);
-			}
-		}
-
-		if(empty($this->password)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["password"=>"Enter the password"]);
-		}
-
-		if(empty($this->mob)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["mob"=>"Enter the Mobile Number"]);
-		}
-		elseif (!preg_match("/^[0-9]{10}$/",$this->mob)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["mob"=>"Enter correct Mobile Number"]);
-		}
-
-		if($this->key==1)
-		{
-			return json_encode($this->array_error);
-		}
-		else
-		{
-			$this->key=0;
-			$pass=md5($this->password);
-			$query="INSERT INTO register VALUES(null,'$this->email','$this->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='$this->email'";
-				if($result=$this->connect->query($query)) {
-					$row=$result->fetch_assoc();
-					$id=$row['id'];
-
-					$query="INSERT INTO login VALUES('$id','$this->name','$this->email','$this->username','$this->mob','1')";
-					if(!$this->connect->query($query)) {
-						$this->key=1;
-						echo "You are not registered || Error in registration1";
-					}
-					$join="Joined OpenChat";
-					$query="INSERT INTO profile VALUES('$id','$join','$join','')";
-					if(!$this->connect->query($query)) {
-						$this->key=1;
-						echo "You are not updated || Error in profile";
-					}
-				}
-			}
-		}
-		if ($this->key==0) {
-			$_SESSION['start']=$id;
-			return json_encode(["location"=>"http://localhost/openchat/account.php"]);
-		}
-		else
-		{
-			return json_encode($this->array_error);
-		}
-	}
+        if (!$this->connect->query($query)) {
+            echo "Table is not created || Query failed";
+        }
+
+    }
+
+    function _register($name,$email,$username,$password,$mob)
+    {
+        $this->name=trim($name);
+        $this->email=trim($email);
+        $this->username=trim($username);
+        $this->password=trim($password);
+        $this->mob=trim($mob);
+        if (empty($this->name)) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["name"=>"Enter the name"]);
+        }
+
+        if(empty($this->email)) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["email"=>"Enter the email address"]);
+        }
+        elseif(filter_var($this->email,FILTER_VALIDATE_EMAIL)== false) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["email"=>"Enter correct Email address"]);
+        }
+        else
+        {
+            if($this->ob->validate_email_in_db($this->email))
+            {
+                $this->key=1;
+                $this->array_error=array_merge($this->array_error,["email"=>"Email is already registered"]);
+            }
+        }
+
+        if(empty($this->username)) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["username"=>"Enter the username"]);
+        }
+        else
+        {
+            if($this->ob->validate_username_in_db($this->username))
+            {
+                $this->key=1;
+                $this->array_error=array_merge($this->array_error,["username"=>"Username is already registered"]);
+            }
+        }
+
+        if(empty($this->password)) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["password"=>"Enter the password"]);
+        }
+
+        if(empty($this->mob)) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["mob"=>"Enter the Mobile Number"]);
+        }
+        elseif (!preg_match("/^[0-9]{10}$/",$this->mob)) {
+            $this->key=1;
+            $this->array_error=array_merge($this->array_error,["mob"=>"Enter correct Mobile Number"]);
+        }
+
+        if($this->key==1)
+        {
+            return json_encode($this->array_error);
+        }
+        else
+        {
+            $this->key=0;
+            $pass=md5($this->password);
+            $query="INSERT INTO register VALUES(null,'$this->email','$this->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='$this->email'";
+                if($result=$this->connect->query($query)) {
+                    $row=$result->fetch_assoc();
+                    $id=$row['id'];
+
+                    $query="INSERT INTO login VALUES('$id','$this->name','$this->email','$this->username','$this->mob','1')";
+                    if(!$this->connect->query($query)) {
+                        $this->key=1;
+                        echo "You are not registered || Error in registration1";
+                    }
+                    $join="Joined OpenChat";
+                    $query="INSERT INTO profile VALUES('$id','$join','$join','')";
+                    if(!$this->connect->query($query)) {
+                        $this->key=1;
+                        echo "You are not updated || Error in profile";
+                    }
+                }
+            }
+        }
+        if ($this->key==0) {
+            $_SESSION['start']=$id;
+            return json_encode(["location"=>"http://localhost/openchat/account.php"]);
+        }
+        else
+        {
+            return json_encode($this->array_error);
+        }
+    }
 }
 ?>
\ No newline at end of file

Spacing +58 added lines, -58 removed lines

@@ -17,13 +17,13 @@ 
 
 	function __construct()
 	{
-		$this->array_error=array();
-		$this->key=0;
+		$this->array_error = array();
+		$this->key = 0;
 		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-		$this->ob=new validate();
+		$this->ob = new validate();
 
 
-		$query="CREATE TABLE IF NOT EXISTS register (
+		$query = "CREATE TABLE IF NOT EXISTS register (
 			id int primary key auto_increment unique not null,
 			email varchar(255) unique not null,
 			username varchar(255) unique not null,
@@ -34,7 +34,7 @@ 
 			echo "Table is not created || Query failed";
 		}
 
-			$query="CREATE TABLE IF NOT EXISTS login (
+			$query = "CREATE TABLE IF NOT EXISTS login (
 			login_id int primary key not null,
 			name varchar(255) not null,
 			email varchar(255) unique not null,
@@ -48,7 +48,7 @@ 
 			echo "Table is not created || Query failed";
 		}
 
-		$query="CREATE TABLE IF NOT EXISTS profile (
+		$query = "CREATE TABLE IF NOT EXISTS profile (
 		login_id int primary key not null unique,
 		status text,
 		education text,
@@ -61,98 +61,98 @@ 
 
 	}
 
-	function _register($name,$email,$username,$password,$mob)
+	function _register($name, $email, $username, $password, $mob)
 	{
-		$this->name=trim($name);
-		$this->email=trim($email);
-		$this->username=trim($username);
-		$this->password=trim($password);
-		$this->mob=trim($mob);
+		$this->name = trim($name);
+		$this->email = trim($email);
+		$this->username = trim($username);
+		$this->password = trim($password);
+		$this->mob = trim($mob);
 		if (empty($this->name)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["name"=>"Enter the name"]);
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["name"=>"Enter the name"]);
 		}
 
-		if(empty($this->email)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["email"=>"Enter the email address"]);
+		if (empty($this->email)) {
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["email"=>"Enter the email address"]);
 		}
-		elseif(filter_var($this->email,FILTER_VALIDATE_EMAIL)== false) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["email"=>"Enter correct Email address"]);
+		elseif (filter_var($this->email, FILTER_VALIDATE_EMAIL) == false) {
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["email"=>"Enter correct Email address"]);
 		}
 		else
 		{
-			if($this->ob->validate_email_in_db($this->email))
+			if ($this->ob->validate_email_in_db($this->email))
 			{
-				$this->key=1;
-				$this->array_error=array_merge($this->array_error,["email"=>"Email is already registered"]);
+				$this->key = 1;
+				$this->array_error = array_merge($this->array_error, ["email"=>"Email is already registered"]);
 			}
 		}
 
-		if(empty($this->username)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["username"=>"Enter the username"]);
+		if (empty($this->username)) {
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["username"=>"Enter the username"]);
 		}
 		else
 		{
-			if($this->ob->validate_username_in_db($this->username))
+			if ($this->ob->validate_username_in_db($this->username))
 			{
-				$this->key=1;
-				$this->array_error=array_merge($this->array_error,["username"=>"Username is already registered"]);
+				$this->key = 1;
+				$this->array_error = array_merge($this->array_error, ["username"=>"Username is already registered"]);
 			}
 		}
 
-		if(empty($this->password)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["password"=>"Enter the password"]);
+		if (empty($this->password)) {
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["password"=>"Enter the password"]);
 		}
 
-		if(empty($this->mob)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["mob"=>"Enter the Mobile Number"]);
+		if (empty($this->mob)) {
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["mob"=>"Enter the Mobile Number"]);
 		}
-		elseif (!preg_match("/^[0-9]{10}$/",$this->mob)) {
-			$this->key=1;
-			$this->array_error=array_merge($this->array_error,["mob"=>"Enter correct Mobile Number"]);
+		elseif (!preg_match("/^[0-9]{10}$/", $this->mob)) {
+			$this->key = 1;
+			$this->array_error = array_merge($this->array_error, ["mob"=>"Enter correct Mobile Number"]);
 		}
 
-		if($this->key==1)
+		if ($this->key == 1)
 		{
 			return json_encode($this->array_error);
 		}
 		else
 		{
-			$this->key=0;
-			$pass=md5($this->password);
-			$query="INSERT INTO register VALUES(null,'$this->email','$this->username','$pass')";
-			if(!$this->connect->query($query)) {
-				$this->key=1;
+			$this->key = 0;
+			$pass = md5($this->password);
+			$query = "INSERT INTO register VALUES(null,'$this->email','$this->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='$this->email'";
-				if($result=$this->connect->query($query)) {
-					$row=$result->fetch_assoc();
-					$id=$row['id'];
-
-					$query="INSERT INTO login VALUES('$id','$this->name','$this->email','$this->username','$this->mob','1')";
-					if(!$this->connect->query($query)) {
-						$this->key=1;
+				$query = "SELECT id FROM register WHERE email='$this->email'";
+				if ($result = $this->connect->query($query)) {
+					$row = $result->fetch_assoc();
+					$id = $row['id'];
+
+					$query = "INSERT INTO login VALUES('$id','$this->name','$this->email','$this->username','$this->mob','1')";
+					if (!$this->connect->query($query)) {
+						$this->key = 1;
 						echo "You are not registered || Error in registration1";
 					}
-					$join="Joined OpenChat";
-					$query="INSERT INTO profile VALUES('$id','$join','$join','')";
-					if(!$this->connect->query($query)) {
-						$this->key=1;
+					$join = "Joined OpenChat";
+					$query = "INSERT INTO profile VALUES('$id','$join','$join','')";
+					if (!$this->connect->query($query)) {
+						$this->key = 1;
 						echo "You are not updated || Error in profile";
 					}
 				}
 			}
 		}
-		if ($this->key==0) {
-			$_SESSION['start']=$id;
+		if ($this->key == 0) {
+			$_SESSION['start'] = $id;
 			return json_encode(["location"=>"http://localhost/openchat/account.php"]);
 		}
 		else

Braces +7 added lines, -14 removed lines

@@ -76,12 +76,10 @@ 
 		if(empty($this->email)) {
 			$this->key=1;
 			$this->array_error=array_merge($this->array_error,["email"=>"Enter the email address"]);
-		}
-		elseif(filter_var($this->email,FILTER_VALIDATE_EMAIL)== false) {
+		} elseif(filter_var($this->email,FILTER_VALIDATE_EMAIL)== false) {
 			$this->key=1;
 			$this->array_error=array_merge($this->array_error,["email"=>"Enter correct Email address"]);
-		}
-		else
+		} else
 		{
 			if($this->ob->validate_email_in_db($this->email))
 			{
@@ -93,8 +91,7 @@ 
 		if(empty($this->username)) {
 			$this->key=1;
 			$this->array_error=array_merge($this->array_error,["username"=>"Enter the username"]);
-		}
-		else
+		} else
 		{
 			if($this->ob->validate_username_in_db($this->username))
 			{
@@ -111,8 +108,7 @@ 
 		if(empty($this->mob)) {
 			$this->key=1;
 			$this->array_error=array_merge($this->array_error,["mob"=>"Enter the Mobile Number"]);
-		}
-		elseif (!preg_match("/^[0-9]{10}$/",$this->mob)) {
+		} elseif (!preg_match("/^[0-9]{10}$/",$this->mob)) {
 			$this->key=1;
 			$this->array_error=array_merge($this->array_error,["mob"=>"Enter correct Mobile Number"]);
 		}
@@ -120,8 +116,7 @@ 
 		if($this->key==1)
 		{
 			return json_encode($this->array_error);
-		}
-		else
+		} else
 		{
 			$this->key=0;
 			$pass=md5($this->password);
@@ -129,8 +124,7 @@ 
 			if(!$this->connect->query($query)) {
 				$this->key=1;
 				echo "You are not registered || Error in registration2";
-			}
-			else
+			} else
 			{
 				$query="SELECT id FROM register WHERE email='$this->email'";
 				if($result=$this->connect->query($query)) {
@@ -154,8 +148,7 @@ 
 		if ($this->key==0) {
 			$_SESSION['start']=$id;
 			return json_encode(["location"=>"http://localhost/openchat/account.php"]);
-		}
-		else
+		} else
 		{
 			return json_encode($this->array_error);
 		}