ankitjain28may / openchat

views/profile_generate.php

Spacing +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use ChatApp\Profile;
 use Dotenv\Dotenv;
@@ -16,15 +16,15 @@ 
 
 $userId = Session::get('start');
 $data = '';
-if(isset($_POST['submit']))
+if (isset($_POST['submit']))
 {
 	$data = Profile::getProfile($userId);
-	if($data != NULL):
+	if ($data != NULL):
 		$status = get($_POST['status'], $data['status']);
 		$edu = get($_POST['education'], $data['education']);
 		$gender = get($_POST['gender'], $data['gender']);
 		$query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
-		if($result = $connect->query($query))
+		if ($result = $connect->query($query))
 		{
 			header('Location:'.getenv('APP_URL').'/views/account.php');
 		}

views/account.php

Spacing +22 added lines, -22 removed lines

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

views/validate_register.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Register;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
 	$registerField = json_decode($_POST['q']);
 	$name = $registerField->name;
@@ -13,7 +13,7 @@ 
 	$password = $registerField->password;
 	$obRegister = new Register();
 	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
-	if(isset($result))
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

src/Login.php

Spacing +7 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -37,13 +37,13 @@ 
 
 		if (preg_match("/^[@]{1}$/", $login))
 		{
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
+			if (filter_var($login, FILTER_VALIDATE_EMAIL) == false)
 			{
 			$this->onError("login", " *Enter correct Email address");
 			}
 		}
 
-		if($this->flag == 0)
+		if ($this->flag == 0)
 		{
 			$password = md5($password);
 			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
@@ -54,7 +54,7 @@ 
 					$row = $result->fetch_assoc();
 					$loginID = $row['login_id'];
 					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
-					if($result = $this->connect->query($query))
+					if ($result = $this->connect->query($query))
 					{
 						if ($result->num_rows > 0)
 						{
@@ -66,12 +66,12 @@ 
 						$this->onError("passLogin", " *Invalid password");
 						return json_encode($this->error);
 					}
-					return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+					return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 				}
 				$this->onError("login", " *Invalid username or email");
 				return json_encode($this->error);
 			}
-			return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+			return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 		}
 		else
 		{
@@ -95,7 +95,7 @@ 
 		foreach ($data as $key => $value) {
 			$data[$key] = trim($data[$key]);
 			$value = trim($value);
-			if(empty($value))
+			if (empty($value))
 			{
 				$this->onError($key, $errorCode[$key]);
 			}

src/Register.php

Spacing +13 added lines, -13 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace ChatApp;
 
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Validate;
 use ChatApp\Session;
 use Dotenv\Dotenv;
@@ -41,16 +41,16 @@ 
 		$password = $data["passRegister"];
 		$userId = '';
 
-		if(filter_var($email, FILTER_VALIDATE_EMAIL) == false)
+		if (filter_var($email, FILTER_VALIDATE_EMAIL) == false)
 		{
 			$this->onError("email", " *Enter correct Email address");
 		}
-		else if($this->obValidate->validateEmailInDb($email) === 1)
+		else if ($this->obValidate->validateEmailInDb($email) === 1)
 		{
 			$this->onError("email", " *Email is already registered");
 		}
 
-		if($this->obValidate->validateUsernameInDb($username) === 1)
+		if ($this->obValidate->validateUsernameInDb($username) === 1)
 		{
 			$this->onError("username", " *Username is already registered");
 		}
@@ -59,7 +59,7 @@ 
 			$this->onError("mob", " *Enter correct Mobile Number");
 		}
 
-		if($this->flag == 1)
+		if ($this->flag == 1)
 		{
 			return json_encode($this->error);
 		}
@@ -67,26 +67,26 @@ 
 		$password = md5($password);
 
 		$query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')";
-		if(!$this->connect->query($query))
+		if (!$this->connect->query($query))
 		{
-			return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+			return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 		}
 		$query = "SELECT id FROM register WHERE email = '$email'";
-		if($result = $this->connect->query($query))
+		if ($result = $this->connect->query($query))
 		{
 			$row = $result->fetch_assoc();
 			$userId = $row['id'];
 			$query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
 
-			if(!$this->connect->query($query))
+			if (!$this->connect->query($query))
 			{
-				return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+				return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 			}
 
 			$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
-			if(!$this->connect->query($query))
+			if (!$this->connect->query($query))
 			{
-				return json_encode(["Error" => "You are not registered, ".$this->connect->error ]);
+				return json_encode(["Error" => "You are not registered, ".$this->connect->error]);
 			}
 
 			Session::put('start', $userId);
@@ -116,7 +116,7 @@ 
 		foreach ($data as $key => $value) {
 			$data[$key] = trim($data[$key]);
 			$value = trim($value);
-			if(empty($value))
+			if (empty($value))
 			{
 				$this->onError($key, $errorCode[$key]);
 			}

views/validate_login.php

Spacing +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Login;
 
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
     $loginField = json_decode($_POST['q']);
     $login = $loginField->login;
@@ -14,7 +14,7 @@ 
         'passLogin' => $password
     );
     $result = $obLogin->authLogin($data);
-    if(isset($result))
+    if (isset($result))
         echo $result;
     else
         echo json_encode([]);

views/message.php

Spacing +4 added lines, -4 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();
 
-if(Session::get('start') != null && empty($_GET['user']))
+if (Session::get('start') != null && empty($_GET['user']))
 {
 
 ?>
@@ -174,7 +174,7 @@ 
 
 <?php
 }
-else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+else {
+  header('Location:'.getenv('APP_URL')."/index.php");
 }
 ?>

src/Compose.php

Spacing +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -33,14 +33,14 @@ 
         $userId = $msg->userId;
         $suggestion = $msg->value;
         $suggestion = trim($suggestion);
-        if(!empty($userId) && !empty($suggestion))
+        if (!empty($userId) && !empty($suggestion))
         {
             $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
-            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())
                     {
                         $this->array = array_merge($this->array, [$row]);
                     }

src/Search.php

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Time;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -34,20 +34,20 @@ 
         $userId = $suggestion->userId;
         $suggestion = trim($suggestion->value);
         $flag = 0;
-        if(!empty($userId) && !empty($suggestion))
+        if (!empty($userId) && !empty($suggestion))
         {
             $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC";
-            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 = '$userId') or (user2 = '$check_id' and user1 = '$userId')";
-                        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']);
@@ -59,7 +59,7 @@ 
                     }
                 }
             }
-            if($flag != 0)
+            if ($flag != 0)
             {
                 $this->array = array_merge([], ["Search" => $this->array]);
                 return json_encode($this->array);