ankitjain28may / openchat

src/Profile.php

Braces +4 added lines, -3 removed lines

@@ -14,12 +14,13 @@
         $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
         $query = "SELECT * from profile where login_id = '$userId'";
         $result = $connect->query($query);
-        if($result->num_rows > 0)                   // if true
+        if($result->num_rows > 0) {
+            // if true
         {
             $details = $result->fetch_assoc();
-            return $details;
         }
-        else
+            return $details;
+        } else
         {
             return NULL;
         }

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?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();
@@ -23,7 +23,7 @@ 
         );
         $query = "SELECT * from profile where login_id = '$userId'";
         $result = $connect->query($query);
-        if($result->num_rows > 0)                   // if true
+        if ($result->num_rows > 0)                   // if true
         {
             $details = $result->fetch_assoc();
             return $details;

src/Register.php

Braces +8 added lines, -16 removed lines

@@ -36,11 +36,9 @@ 
 
 		if(empty($email)) {
 			$this->onError(["email" => " *Enter the email address"]);
-		}
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
+		} elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
 			$this->onError(["email" => " *Enter correct Email address"]);
-		}
-		else
+		} else
 		{
 			if($this->obValidate->validateEmailInDb($email) === 1)
 			{
@@ -51,8 +49,7 @@ 
 
 		if(empty($username)) {
 			$this->onError(["username" => " *Enter the username"]);
-		}
-		else
+		} else
 		{
 			if($this->obValidate->validateUsernameInDb($username) === 1)
 			{
@@ -67,16 +64,14 @@ 
 
 		if(empty($mob)) {
 			$this->onError(["mob" => " *Enter the Mobile Number"]);
-		}
-		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
+		} elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
 			$this->onError(["mob" => " *Enter correct Mobile Number"]);
 		}
 
 		if($this->key == 1)
 		{
 			return json_encode($this->error);
-		}
-		else
+		} else
 		{
 			$this->key = 0;
 			$pass = md5($password);
@@ -84,8 +79,7 @@ 
 			if(!$this->connect->query($query)) {
 				$this->key = 1;
 				echo "You are not registered || Error in registration1";
-			}
-			else
+			} else
 			{
 				$query = "SELECT id FROM register WHERE email = '$email'";
 				if($result = $this->connect->query($query)) {
@@ -96,8 +90,7 @@ 
 					if(!$this->connect->query($query)) {
 						$this->key = 1;
 						echo "You are not registered || Error in registration2";
-					}
-					else
+					} else
 					{
 						$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
 						if(!$this->connect->query($query)) {
@@ -113,8 +106,7 @@ 
 			return json_encode([
 				"location" => URL."/account.php"
 			]);
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}

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;
@@ -44,45 +44,45 @@ 
 			$this->onError(["name" => " *Enter the name"]);
 		}
 
-		if(empty($email)) {
+		if (empty($email)) {
 			$this->onError(["email" => " *Enter the email address"]);
 		}
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
+		elseif (filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
 			$this->onError(["email" => " *Enter correct Email address"]);
 		}
 		else
 		{
-			if($this->obValidate->validateEmailInDb($email) === 1)
+			if ($this->obValidate->validateEmailInDb($email) === 1)
 			{
 
 				$this->onError(["email" => " *Email is already registered"]);
 			}
 		}
 
-		if(empty($username)) {
+		if (empty($username)) {
 			$this->onError(["username" => " *Enter the username"]);
 		}
 		else
 		{
-			if($this->obValidate->validateUsernameInDb($username) === 1)
+			if ($this->obValidate->validateUsernameInDb($username) === 1)
 			{
 
 				$this->onError(["username" => " *Username is already registered"]);
 			}
 		}
 
-		if(empty($password)) {
+		if (empty($password)) {
 			$this->onError(["password" => " *Enter the password"]);
 		}
 
-		if(empty($mob)) {
+		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)
+		if ($this->key == 1)
 		{
 			return json_encode($this->error);
 		}
@@ -91,26 +91,26 @@ 
 			$this->key = 0;
 			$pass = md5($password);
 			$query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
-			if(!$this->connect->query($query)) {
+			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)) {
+				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)) {
 						$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)) {
+						if (!$this->connect->query($query)) {
 							$this->key = 1;
 							echo "You are not registered || Error in registration3";
 						}

Indentation +118 added lines, -118 removed lines

@@ -12,127 +12,127 @@
 
 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')."/views/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')."/views/account.php"
+            ]);
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+    }
+
+    public function onError($value)
+    {
+        $this->key = 1;
+        $this->error = array_merge($this->error, $value);
+    }
 }

tests/ExistsTest.php

Indentation +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
     }
 
     /**
-    * @dataProvider ClassNameProvider
-    */
+     * @dataProvider ClassNameProvider
+     */
     public function testClassExists($className)
     {
         $this->assertTrue(class_exists($className));

src/Session.php

Doc Comments +6 added lines

@@ -6,10 +6,16 @@
 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);
     }

Spacing +3 added lines, -3 removed lines

@@ -6,15 +6,15 @@
 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

index.php

Spacing +2 added lines, -2 removed lines

@@ -1,13 +1,13 @@
 <?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");
 }

src/Conversation.php

Spacing +12 added lines, -12 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 ChatApp\Time;
 use ChatApp\User;
@@ -40,7 +40,7 @@ 
     {
 
         $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 @@ 
 
             $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 @@ 
                 }
 
                 $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]);
                         }
 

Braces +14 added lines, -16 removed lines

@@ -55,10 +55,11 @@ 
                 $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 @@ 
                     {
                         $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 @@ 
 
                         $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');
         }

src/Receiver.php

Spacing +2 added lines, -2 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\User;
 use ChatApp\Session;
 use ChatApp\Conversation;
@@ -36,7 +36,7 @@ 
         $name = $this->messages['name'];
         $this->messages = json_decode($this->conversation->conversationLoad($msg, True));
         $id = json_decode($msg)->username;
-        for ($i=1 ; $i < count($this->messages); $i++) {
+        for ($i = 1; $i < count($this->messages); $i++) {
             $this->messages[$i]->start = $id;
         }
         $this->messages[0]->username = $username;

src/User.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 
 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();
@@ -30,12 +30,12 @@ 
 
     public function userDetails($userId, $para)
     {
-        if($para == True)
+        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;

Braces +9 added lines, -7 removed lines

@@ -30,17 +30,19 @@
 
     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;
         }

src/Online.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?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();
@@ -22,7 +22,7 @@ 
             getenv('DB_NAME')
         );
         $query = "Update login set login_status = 1 where login_id = '$userId'";
-        if(!$connect->query($query));
+        if (!$connect->query($query));
             echo $connect->error;
         $connect->close();
     }
@@ -36,7 +36,7 @@ 
             getenv('DB_NAME')
         );
         $query = "Update login set login_status = 0 where login_id = '$userId'";
-        if(!$connect->query($query));
+        if (!$connect->query($query));
             echo $connect->error;
         $connect->close();
     }