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

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

@@ -6,10 +6,16 @@
 block discarded – undo
 class Session
 {
 
+    /**
+     * @param string $key
+     */
     public static function put($key, $value){
         $_SESSION[$key] = $value;
     }
 
+    /**
+     * @param string $key
+     */
     public static function get($key){
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }

Please login to merge, or discard this patch.

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

@@ -6,15 +6,15 @@
 block discarded – undo
 class Session
 {
 
-    public static function put($key, $value){
+    public static function put($key, $value) {
         $_SESSION[$key] = $value;
     }
 
-    public static function get($key){
+    public static function get($key) {
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
     }
 
-    public static function forget($key){
+    public static function forget($key) {
         unset($_SESSION[$key]);
     }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

account.php 3 patches

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.

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

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

Please login to merge, or discard this patch.

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

@@ -22,19 +22,19 @@  discard block
 block discarded – undo
 		$location = getenv('APP_URL') . "/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.

index.php 1 patch

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

@@ -1,13 +1,13 @@
 block discarded – undo
 <?php
 
-require_once (__DIR__ . '/vendor/autoload.php');
+require_once (__DIR__.'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(__DIR__);
 $dotenv->load();
 
 
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
     header("Location:".getenv('APP_URL')."/account.php");
 }

Please login to merge, or discard this patch.

check.php 1 patch

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

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-require (__DIR__ . '/vendor/autoload.php');
+require (__DIR__.'/vendor/autoload.php');
 $dotenv = new Dotenv\Dotenv(__DIR__);
 $dotenv->load();
 

Please login to merge, or discard this patch.

message.php 2 patches

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.

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

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?php
 
-require_once (__DIR__ . '/vendor/autoload.php');
+require_once (__DIR__.'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(__DIR__);
 $dotenv->load();
 
 
-if(Session::get('start') != null && empty($_GET['user']))
+if (Session::get('start') != null && empty($_GET['user']))
 {
 ?>
 <!DOCTYPE html>
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
 
 <?php
 }
-else{
-	header('Location:'. getenv('APP_URL'));
+else {
+	header('Location:'.getenv('APP_URL'));
 }
 ?>

Please login to merge, or discard this patch.

src/Conversation.php 2 patches

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

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use ChatApp\Time;
 use ChatApp\User;
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
     {
 
         $flag = 1;
-        if(Session::get('start') != null && isset($msg))
+        if (Session::get('start') != null && isset($msg))
         {
             $add_load = 0;
             $userId = Session::get('start');
@@ -50,25 +50,25 @@  discard block
 block discarded – undo
 
             $fetch = $this->obUser->userDetails($username, $para);
 
-            if($fetch != NULL)
+            if ($fetch != NULL)
             {
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($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))
+                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;
@@ -76,14 +76,14 @@  discard block
 block discarded – undo
                 }
 
                 $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' => $userId]);
+                            $row = array_merge($row, ['start' => $userId]);
                             $this->array = array_merge($this->array, [$row]);
                         }
 

Please login to merge, or discard this 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/Compose.php 1 patch

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

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -34,18 +34,18 @@  discard block
 block discarded – undo
     public function selectUser($msg)
     {
         $msg = $msg->value;
-        if(Session::get('start') != null && isset($msg))
+        if (Session::get('start') != null && isset($msg))
         {
             $userId = Session::get('start');
             $suggestion = trim($msg);
-            if($suggestion != "" )
+            if ($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]);
                         }

Please login to merge, or discard this patch.

src/Validate.php 2 patches

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.

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

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();

Please login to merge, or discard this patch.

src/Login.php 2 patches

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.

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

@@ -1,7 +1,7 @@  discard block
 block discarded – undo
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
+require_once (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -33,20 +33,20 @@  discard block
 block discarded – undo
 		$login = trim($login);
 		$password = trim($password);
 
-		if(empty($login))
+		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)
+			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)) {
+		if (empty($password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
 		}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
 			$password = md5($password);
 		}
 
-		if($this->key == 0)
+		if ($this->key == 0)
 		{
 			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
 			if ($result = $this->connect->query($query))
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
 					$row = $result->fetch_assoc();
 					$loginID = $row['login_id'];
 					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
-					if($result = $this->connect->query($query))
+					if ($result = $this->connect->query($query))
 					{
 						if ($result->num_rows > 0)
 						{

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	?>

		@@ -6,10 +6,16 @@
		block discarded – undo
6	6	class Session
7	7	{
8	8
	9	+ /**
	10	+ * @param string $key
	11	+ */
9	12	public static function put($key, $value){
10	13	$_SESSION[$key] = $value;
11	14	}
12	15
	16	+ /**
	17	+ * @param string $key
	18	+ */
13	19	public static function get($key){
14	20	return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
15	21	}

		@@ -6,15 +6,15 @@
		block discarded – undo
6	6	class Session
7	7	{
8	8
9		- public static function put($key, $value){
	9	+ public static function put($key, $value) {
10	10	$_SESSION[$key] = $value;
11	11	}
12	12
13		- public static function get($key){
	13	+ public static function get($key) {
14	14	return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
15	15	}
16	16
17		- public static function forget($key){
	17	+ public static function forget($key) {
18	18	unset($_SESSION[$key]);
19	19	}
20	20	}
21	21	\ No newline at end of file

		@@ -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

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

		@@ -22,19 +22,19 @@ discard block
		block discarded – undo
22	22	$location = getenv('APP_URL') . "/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	}

		@@ -1,13 +1,13 @@
		block discarded – undo
1	1	<?php
2	2
3		-require_once (__DIR__ . '/vendor/autoload.php');
	3	+require_once (__DIR__.'/vendor/autoload.php');
4	4	use ChatApp\Session;
5	5	use Dotenv\Dotenv;
6	6	$dotenv = new Dotenv(__DIR__);
7	7	$dotenv->load();
8	8
9	9
10		-if(Session::get('start') != null)
	10	+if (Session::get('start') != null)
11	11	{
12	12	header("Location:".getenv('APP_URL')."/account.php");
13	13	}

		@@ -1,6 +1,6 @@
		block discarded – undo
1	1	<?php
2	2
3		-require (__DIR__ . '/vendor/autoload.php');
	3	+require (__DIR__.'/vendor/autoload.php');
4	4	$dotenv = new Dotenv\Dotenv(__DIR__);
5	5	$dotenv->load();
6	6

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-require_once (__DIR__ . '/vendor/autoload.php');
	3	+require_once (__DIR__.'/vendor/autoload.php');
4	4	use ChatApp\Session;
5	5	use Dotenv\Dotenv;
6	6	$dotenv = new Dotenv(__DIR__);
7	7	$dotenv->load();
8	8
9	9
10		-if(Session::get('start') != null && empty($_GET['user']))
	10	+if (Session::get('start') != null && empty($_GET['user']))
11	11	{
12	12	?>
13	13	<!DOCTYPE html>
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137
138	138	<?php
139	139	}
140		-else{
141		- header('Location:'. getenv('APP_URL'));
	140	+else {
	141	+ header('Location:'.getenv('APP_URL'));
142	142	}
143	143	?>

		@@ -1,7 +1,7 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3	3	namespace ChatApp;
4		-require_once (dirname(__DIR__) . '/vendor/autoload.php');
	4	+require_once (dirname(__DIR__).'/vendor/autoload.php');
5	5	use ChatApp\Session;
6	6	use ChatApp\Time;
7	7	use ChatApp\User;
		@@ -40,7 +40,7 @@ discard block
		block discarded – undo
40	40	{
41	41
42	42	$flag = 1;
43		- if(Session::get('start') != null && isset($msg))
	43	+ if (Session::get('start') != null && isset($msg))
44	44	{
45	45	$add_load = 0;
46	46	$userId = Session::get('start');
		@@ -50,25 +50,25 @@ discard block
		block discarded – undo
50	50
51	51	$fetch = $this->obUser->userDetails($username, $para);
52	52
53		- if($fetch != NULL)
	53	+ if ($fetch != NULL)
54	54	{
55	55	$login_id = (int)$fetch['login_id'];
56	56
57	57	// Unique Identifier
58		- if($login_id > $userId)
	58	+ if ($login_id > $userId)
59	59	$identifier = $userId.':'.$login_id;
60	60	else
61	61	$identifier = $login_id.':'.$userId;
62	62
63	63	$query = "SELECT total_messages from total_message where identifier = '$identifier'";
64		- if($result = $this->connect->query($query))
	64	+ if ($result = $this->connect->query($query))
65	65	{
66		- if($result->num_rows > 0)
	66	+ if ($result->num_rows > 0)
67	67	{
68	68	$total = $result->fetch_assoc();
69	69	$total = $total['total_messages'];
70		- if($total - $load > 0)
71		- if($total - $load > 10)
	70	+ if ($total - $load > 0)
	71	+ if ($total - $load > 10)
72	72	$add_load = $load + 10;
73	73	else
74	74	$add_load = $total;
		@@ -76,14 +76,14 @@ discard block
		block discarded – undo
76	76	}
77	77
78	78	$query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load;
79		- if($result = $this->connect->query($query))
	79	+ if ($result = $this->connect->query($query))
80	80	{
81		- if($result->num_rows > 0)
	81	+ if ($result->num_rows > 0)
82	82	{
83		- while($row = $result->fetch_assoc())
	83	+ while ($row = $result->fetch_assoc())
84	84	{
85	85	$row['time'] = $this->obTime->timeConversion($row['time']);
86		- $row = array_merge($row,['start' => $userId]);
	86	+ $row = array_merge($row, ['start' => $userId]);
87	87	$this->array = array_merge($this->array, [$row]);
88	88	}
89	89

		@@ -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	}

ankitjain28may / openchat

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

Status

Category

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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