Inspection of ".env file" - ankitjain28may/openchat - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 3bdd73...3b96a7 )

by Ankit

created 2017-01-04 19:24 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') . "/account.php/". $row['username'];
-		header("Location:".$location);
-	}
+    if($row != NULL)
+    {
+        $location = getenv('APP_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:".getenv('APP_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:".getenv('APP_URL')."/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')."/error.php");
-	endif;
+    else:
+        header("Location:".getenv('APP_URL')."/error.php");
+    endif;
 }
 else
 {
-	header("Location: ".getenv('APP_URL'));
+    header("Location: ".getenv('APP_URL'));
 }
 ?>
 

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') . "/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')."/error.php");
-?>
+		if($details != NULL) {
+					$row = array_merge($row, $details);
+		} else {
+					header("Location:".getenv('APP_URL')."/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')."/error.php");
+	}
 	endif;
-}
-else
+} else
 {
 	header("Location: ".getenv('APP_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

@@ -138,6 +138,6 @@
 block discarded – undo
 <?php
 }
 else{
-	header('Location:'. getenv('APP_URL'));
+    header('Location:'. getenv('APP_URL'));
 }
 ?>

Please login to merge, or discard this patch.

src/Conversation.php 1 patch

Braces +14 added lines, -16 removed lines patch added patch discarded remove patch

@@ -55,10 +55,11 @@  discard block
 block discarded – undo
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $userId)
-                    $identifier = $userId.':'.$login_id;
-                else
-                    $identifier = $login_id.':'.$userId;
+                if($login_id > $userId) {
+                                    $identifier = $userId.':'.$login_id;
+                } else {
+                                    $identifier = $login_id.':'.$userId;
+                }
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
                 if($result = $this->connect->query($query))
@@ -67,11 +68,12 @@  discard block
 block discarded – undo
                     {
                         $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;
+                            }
                     }
                 }
 
@@ -89,23 +91,19 @@  discard block
 block discarded – undo
 
                         $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]);
                     }
-                }
-                else
+                } else
                 {
                     echo "Query Failed";
                 }
-            }
-            else
+            } else
             {
                 echo "Query Failed";
             }
-        }
-        else
+        } else
         {
             header('Location:../login.php');
         }

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

@@ -11,40 +11,40 @@
 block discarded – undo
 */
 class Validate
 {
-	protected $connect;
+    protected $connect;
 
-	public function __construct()
-	{
-		$this->connect = mysqli_connect(
+    public function __construct()
+    {
+        $this->connect = mysqli_connect(
             getenv('DB_HOST'),
             getenv('DB_USER'),
             getenv('DB_PASSWORD'),
             getenv('DB_NAME')
         );
-	}
+    }
 
-	public function validateEmailInDb($email)
-	{
-		$query = "SELECT login_id FROM login WHERE email = '$email'";
-		if ($result = $this->connect->query($query))
-		{
-			if ($result->num_rows > 0) {
-				return 1;
-			}
-			else
-				return 0;
-		}
-	}
+    public function validateEmailInDb($email)
+    {
+        $query = "SELECT login_id FROM login WHERE email = '$email'";
+        if ($result = $this->connect->query($query))
+        {
+            if ($result->num_rows > 0) {
+                return 1;
+            }
+            else
+                return 0;
+        }
+    }
 
-	function validateUsernameInDb($username)
-	{
-		$query = "SELECT login_id FROM login WHERE username = '$username'";
-		if ($result = $this->connect->query($query)) {
-			if ($result->num_rows > 0) {
-				return 1;
-			}
-			else
-				return 0;
-		}
-	}
+    function validateUsernameInDb($username)
+    {
+        $query = "SELECT login_id FROM login WHERE username = '$username'";
+        if ($result = $this->connect->query($query)) {
+            if ($result->num_rows > 0) {
+                return 1;
+            }
+            else
+                return 0;
+        }
+    }
 }

Please login to merge, or discard this patch.

src/Login.php 1 patch

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

@@ -11,88 +11,88 @@
 block discarded – undo
 class Login
 {
 
-	protected $key;
-	protected $error;
-	protected $connect;
+    protected $key;
+    protected $error;
+    protected $connect;
 
-	public function __construct()
-	{
-		$this->key = 0;
-		$this->connect = mysqli_connect(
+    public function __construct()
+    {
+        $this->key = 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($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)
-						{
-							Session::put('start', $loginID);
-							return json_encode([
-								"location" => getenv('APP_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)
+                        {
+                            Session::put('start', $loginID);
+                            return json_encode([
+                                "location" => getenv('APP_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 +118 added lines, -118 removed lines patch added patch discarded remove patch

@@ -12,127 +12,127 @@
 block discarded – undo
 
 class Register
 {
-	protected $error;
-	protected $key;
-	protected $obValidate;
-	protected $connect;
-
-	public function __construct()
-	{
-		$this->error = array();
-		$this->key = 0;
-		$this->connect = mysqli_connect(
+    protected $error;
+    protected $key;
+    protected $obValidate;
+    protected $connect;
+
+    public function __construct()
+    {
+        $this->error = array();
+        $this->key = 0;
+        $this->connect = mysqli_connect(
             getenv('DB_HOST'),
             getenv('DB_USER'),
             getenv('DB_PASSWORD'),
             getenv('DB_NAME')
         );
-		$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 = '';
-
-		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)
-			{
-
-				$this->onError(["email" => " *Email is already registered"]);
-			}
-		}
-
-		if(empty($username)) {
-			$this->onError(["username" => " *Enter the username"]);
-		}
-		else
-		{
-			if($this->obValidate->validateUsernameInDb($username) === 1)
-			{
-
-				$this->onError(["username" => " *Username is already registered"]);
-			}
-		}
-
-		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($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 registration1";
-			}
-			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 registration2";
-					}
-					else
-					{
-						$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
-						if(!$this->connect->query($query)) {
-							$this->key = 1;
-							echo "You are not registered || Error in registration3";
-						}
-					}
-				}
-			}
-		}
-		if ($this->key == 0) {
-			Session::put('start', $userId);
-			return json_encode([
-				"location" => getenv('APP_URL')."/account.php"
-			]);
-		}
-		else
-		{
-			return json_encode($this->error);
-		}
-	}
-
-	public function onError($value)
-	{
-		$this->key = 1;
-		$this->error = array_merge($this->error, $value);
-	}
+        $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 = '';
+
+        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)
+            {
+
+                $this->onError(["email" => " *Email is already registered"]);
+            }
+        }
+
+        if(empty($username)) {
+            $this->onError(["username" => " *Enter the username"]);
+        }
+        else
+        {
+            if($this->obValidate->validateUsernameInDb($username) === 1)
+            {
+
+                $this->onError(["username" => " *Username is already registered"]);
+            }
+        }
+
+        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($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 registration1";
+            }
+            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 registration2";
+                    }
+                    else
+                    {
+                        $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
+                        if(!$this->connect->query($query)) {
+                            $this->key = 1;
+                            echo "You are not registered || Error in registration3";
+                        }
+                    }
+                }
+            }
+        }
+        if ($this->key == 0) {
+            Session::put('start', $userId);
+            return json_encode([
+                "location" => getenv('APP_URL')."/account.php"
+            ]);
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+    }
+
+    public function onError($value)
+    {
+        $this->key = 1;
+        $this->error = array_merge($this->error, $value);
+    }
 }

Please login to merge, or discard this patch.

src/User.php 1 patch

Braces +9 added lines, -7 removed lines patch added patch discarded remove patch

@@ -30,17 +30,19 @@
 block discarded – undo
 
     public function userDetails($userId, $para)
     {
-        if($para == True)
-            $this->query = "SELECT * from login where login_id = '$userId'";
-        else
-            $this->query = "SELECT * from login where username = '$userId'";
+        if($para == True) {
+                    $this->query = "SELECT * from login where login_id = '$userId'";
+        } else {
+                    $this->query = "SELECT * from login where username = '$userId'";
+        }
         $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;
         }

Please login to merge, or discard this patch.

src/Reply.php 1 patch

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

@@ -31,18 +31,22 @@  discard block
 block discarded – undo
     public function replyTo($msg)
     {
 
-        if(Session::get('start') != null && isset($msg))  //checks for session login and the value send
+        if(Session::get('start') != null && isset($msg)) {
+            //checks for session login and the value send
         {
             $userId = Session::get('start');
+        }
             $msg = json_decode($msg);   //decode json value
             $identifier = $msg->name;
 
             $receiverID = $identifier;  //stores id of the person whom message is to be sent
 
-            if($identifier > $userId)    // geneate specific unique code to store messages
+            if($identifier > $userId) {
+                // geneate specific unique code to store messages
                 $identifier = $userId . ":" . $identifier;
-            else
-                $identifier = $identifier . ":" . $userId;
+            } else {
+                            $identifier = $identifier . ":" . $userId;
+            }
 
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
 
@@ -56,27 +60,31 @@  discard block
 block discarded – undo
                 $query = "SELECT * from login where login_id = '$receiverID'";
 
                 $result = $this->connect->query($query);
-                if($result->num_rows > 0)     // if true
+                if($result->num_rows > 0) {
+                    // if true
                 {
                     //check whether he is sending message for thr first time or he has sent messages before
                     $query = "SELECT * from total_message where identifier = '$identifier'";
+                }
                     $result = $this->connect->query($query);
-                    if($result->num_rows>0)               // if he has sent messages before
+                    if($result->num_rows>0) {
+                        // if he has sent messages before
                     {
                         // Update Total_Message Table
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
+                    }
                         $this->updateMessages($query, $identifier, $reply, $userId, $time);
 
-                    }
-                    else    // if he sends message for the first time
+                    } else    // if he sends message for the first time
                     {
                         $length = strlen($userId);
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
+                        if(substr($identifier, 0, $length) == $userId) {
+                            // generate specific unique code
                         {
                             $user2 = substr($identifier, $length+1);
-                            $user1 = $userId;
                         }
-                        else
+                            $user1 = $userId;
+                        } else
                         {
                             $user2 = $userId;
                             $length = strlen($identifier) - $length-1;
@@ -86,14 +94,12 @@  discard block
 block discarded – undo
                         $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";
                         $this->updateMessages($query, $identifier, $reply, $userId, $time);
                     }
-                }
-                else // if he is unauthorized echo message is failed
+                } else // if he is unauthorized echo message is failed
                 {
                     echo "Message is failed";
                 }
             }
-        }
-        else
+        } else
         {
             echo "failed";
         }
@@ -109,8 +115,7 @@  discard block
 block discarded – undo
             if($result = $this->connect->query($query))
             {
                 echo "Messages is sent \n";    // if query is executed return true
-            }
-            else
+            } else
             {
                 echo "Message is failed";
             }

Please login to merge, or discard this patch.

		@@ -138,6 +138,6 @@
		block discarded – undo
138	138	<?php
139	139	}
140	140	else{
141		- header('Location:'. getenv('APP_URL'));
	141	+ header('Location:'. getenv('APP_URL'));
142	142	}
143	143	?>

		@@ -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') . "/account.php/". $row['username'];
23		- header("Location:".$location);
24		- }
	20	+ if($row != NULL)
	21	+ {
	22	+ $location = getenv('APP_URL') . "/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')."/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')."/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')."/error.php");
124		- endif;
	122	+ else:
	123	+ header("Location:".getenv('APP_URL')."/error.php");
	124	+ endif;
125	125	}
126	126	else
127	127	{
128		- header("Location: ".getenv('APP_URL'));
	128	+ header("Location: ".getenv('APP_URL'));
129	129	}
130	130	?>
131	131

		@@ -22,19 +22,19 @@ discard block
		block discarded – undo
22	22	$location = getenv('APP_URL') . "/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')."/error.php");
37		-?>
	32	+ if($details != NULL) {
	33	+ $row = array_merge($row, $details);
	34	+ } else {
	35	+ header("Location:".getenv('APP_URL')."/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')."/error.php");
	133	+ }
124	134	endif;
125		-}
126		-else
	135	+} else
127	136	{
128	137	header("Location: ".getenv('APP_URL'));
129	138	}

		@@ -55,10 +55,11 @@ discard block
		block discarded – undo
55	55	$login_id = (int)$fetch['login_id'];
56	56
57	57	// Unique Identifier
58		- if($login_id > $userId)
59		- $identifier = $userId.':'.$login_id;
60		- else
61		- $identifier = $login_id.':'.$userId;
	58	+ if($login_id > $userId) {
	59	+ $identifier = $userId.':'.$login_id;
	60	+ } else {
	61	+ $identifier = $login_id.':'.$userId;
	62	+ }
62	63
63	64	$query = "SELECT total_messages from total_message where identifier = '$identifier'";
64	65	if($result = $this->connect->query($query))
		@@ -67,11 +68,12 @@ discard block
		block discarded – undo
67	68	{
68	69	$total = $result->fetch_assoc();
69	70	$total = $total['total_messages'];
70		- if($total - $load > 0)
71		- if($total - $load > 10)
	71	+ if($total - $load > 0) {
	72	+ if($total - $load > 10)
72	73	$add_load = $load + 10;
73		- else
74		- $add_load = $total;
	74	+ } else {
	75	+ $add_load = $total;
	76	+ }
75	77	}
76	78	}
77	79
		@@ -89,23 +91,19 @@ discard block
		block discarded – undo
89	91
90	92	$this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array);
91	93	return json_encode($this->array);
92		- }
93		- else
	94	+ } else
94	95	{
95	96	return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]);
96	97	}
97		- }
98		- else
	98	+ } else
99	99	{
100	100	echo "Query Failed";
101	101	}
102		- }
103		- else
	102	+ } else
104	103	{
105	104	echo "Query Failed";
106	105	}
107		- }
108		- else
	106	+ } else
109	107	{
110	108	header('Location:../login.php');
111	109	}

		@@ -11,40 +11,40 @@
		block discarded – undo
11	11	*/
12	12	class Validate
13	13	{
14		- protected $connect;
	14	+ protected $connect;
15	15
16		- public function __construct()
17		- {
18		- $this->connect = mysqli_connect(
	16	+ public function __construct()
	17	+ {
	18	+ $this->connect = mysqli_connect(
19	19	getenv('DB_HOST'),
20	20	getenv('DB_USER'),
21	21	getenv('DB_PASSWORD'),
22	22	getenv('DB_NAME')
23	23	);
24		- }
	24	+ }
25	25
26		- public function validateEmailInDb($email)
27		- {
28		- $query = "SELECT login_id FROM login WHERE email = '$email'";
29		- if ($result = $this->connect->query($query))
30		- {
31		- if ($result->num_rows > 0) {
32		- return 1;
33		- }
34		- else
35		- return 0;
36		- }
37		- }
	26	+ public function validateEmailInDb($email)
	27	+ {
	28	+ $query = "SELECT login_id FROM login WHERE email = '$email'";
	29	+ if ($result = $this->connect->query($query))
	30	+ {
	31	+ if ($result->num_rows > 0) {
	32	+ return 1;
	33	+ }
	34	+ else
	35	+ return 0;
	36	+ }
	37	+ }
38	38
39		- function validateUsernameInDb($username)
40		- {
41		- $query = "SELECT login_id FROM login WHERE username = '$username'";
42		- if ($result = $this->connect->query($query)) {
43		- if ($result->num_rows > 0) {
44		- return 1;
45		- }
46		- else
47		- return 0;
48		- }
49		- }
	39	+ function validateUsernameInDb($username)
	40	+ {
	41	+ $query = "SELECT login_id FROM login WHERE username = '$username'";
	42	+ if ($result = $this->connect->query($query)) {
	43	+ if ($result->num_rows > 0) {
	44	+ return 1;
	45	+ }
	46	+ else
	47	+ return 0;
	48	+ }
	49	+ }
50	50	}

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

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

		@@ -30,17 +30,19 @@
		block discarded – undo
30	30
31	31	public function userDetails($userId, $para)
32	32	{
33		- if($para == True)
34		- $this->query = "SELECT * from login where login_id = '$userId'";
35		- else
36		- $this->query = "SELECT * from login where username = '$userId'";
	33	+ if($para == True) {
	34	+ $this->query = "SELECT * from login where login_id = '$userId'";
	35	+ } else {
	36	+ $this->query = "SELECT * from login where username = '$userId'";
	37	+ }
37	38	$this->result = $this->connect->query($this->query);
38		- if($this->result->num_rows > 0) // if true
	39	+ if($this->result->num_rows > 0) {
	40	+ // if true
39	41	{
40	42	$this->details = $this->result->fetch_assoc();
41		- return $this->details;
42	43	}
43		- else
	44	+ return $this->details;
	45	+ } else
44	46	{
45	47	return NULL;
46	48	}

		@@ -31,18 +31,22 @@ discard block
		block discarded – undo
31	31	public function replyTo($msg)
32	32	{
33	33
34		- if(Session::get('start') != null && isset($msg)) //checks for session login and the value send
	34	+ if(Session::get('start') != null && isset($msg)) {
	35	+ //checks for session login and the value send
35	36	{
36	37	$userId = Session::get('start');
	38	+ }
37	39	$msg = json_decode($msg); //decode json value
38	40	$identifier = $msg->name;
39	41
40	42	$receiverID = $identifier; //stores id of the person whom message is to be sent
41	43
42		- if($identifier > $userId) // geneate specific unique code to store messages
	44	+ if($identifier > $userId) {
	45	+ // geneate specific unique code to store messages
43	46	$identifier = $userId . ":" . $identifier;
44		- else
45		- $identifier = $identifier . ":" . $userId;
	47	+ } else {
	48	+ $identifier = $identifier . ":" . $userId;
	49	+ }
46	50
47	51	$reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
48	52
		@@ -56,27 +60,31 @@ discard block
		block discarded – undo
56	60	$query = "SELECT * from login where login_id = '$receiverID'";
57	61
58	62	$result = $this->connect->query($query);
59		- if($result->num_rows > 0) // if true
	63	+ if($result->num_rows > 0) {
	64	+ // if true
60	65	{
61	66	//check whether he is sending message for thr first time or he has sent messages before
62	67	$query = "SELECT * from total_message where identifier = '$identifier'";
	68	+ }
63	69	$result = $this->connect->query($query);
64		- if($result->num_rows>0) // if he has sent messages before
	70	+ if($result->num_rows>0) {
	71	+ // if he has sent messages before
65	72	{
66	73	// Update Total_Message Table
67	74	$query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
	75	+ }
68	76	$this->updateMessages($query, $identifier, $reply, $userId, $time);
69	77
70		- }
71		- else // if he sends message for the first time
	78	+ } else // if he sends message for the first time
72	79	{
73	80	$length = strlen($userId);
74		- if(substr($identifier, 0, $length) == $userId) // generate specific unique code
	81	+ if(substr($identifier, 0, $length) == $userId) {
	82	+ // generate specific unique code
75	83	{
76	84	$user2 = substr($identifier, $length+1);
77		- $user1 = $userId;
78	85	}
79		- else
	86	+ $user1 = $userId;
	87	+ } else
80	88	{
81	89	$user2 = $userId;
82	90	$length = strlen($identifier) - $length-1;
		@@ -86,14 +94,12 @@ discard block
		block discarded – undo
86	94	$query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";
87	95	$this->updateMessages($query, $identifier, $reply, $userId, $time);
88	96	}
89		- }
90		- else // if he is unauthorized echo message is failed
	97	+ } else // if he is unauthorized echo message is failed
91	98	{
92	99	echo "Message is failed";
93	100	}
94	101	}
95		- }
96		- else
	102	+ } else
97	103	{
98	104	echo "failed";
99	105	}
		@@ -109,8 +115,7 @@ discard block
		block discarded – undo
109	115	if($result = $this->connect->query($query))
110	116	{
111	117	echo "Messages is sent \n"; // if query is executed return true
112		- }
113		- else
	118	+ } else
114	119	{
115	120	echo "Message is failed";
116	121	}

ankitjain28may / openchat

Push — master ( 3bdd73...3b96a7 )

Status

Category

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

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

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

Braces +14 added lines, -16 removed lines patch added patch discarded remove patch

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

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

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

Braces +9 added lines, -7 removed lines patch added patch discarded remove patch

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