ankitjain28may / openchat

src/Search.php

Spacing +9 added lines, -9 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 ChatApp\Session;
 use Dotenv\Dotenv;
@@ -38,23 +38,23 @@ 
         $suggestion = $suggestion->value;
         $flag = 0;
         $userId = Session::get('start');
-        if($userId != null && isset($suggestion))
+        if ($userId != null && isset($suggestion))
         {
             $suggestion = trim($suggestion);
-            if($suggestion != "")
+            if ($suggestion != "")
             {
                 $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name ASC";
-                if($result = $this->connect->query($query))
+                if ($result = $this->connect->query($query))
                 {
-                    if($result->num_rows > 0)
+                    if ($result->num_rows > 0)
                     {
-                        while($row = $result->fetch_assoc())
+                        while ($row = $result->fetch_assoc())
                         {
                             $check_id = $row["login_id"];
                             $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$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']);
@@ -66,7 +66,7 @@ 
                         }
                     }
                 }
-                if($flag != 0)
+                if ($flag != 0)
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);

src/Profile.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 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

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')."/account.php"
-			]);
-		}
-		else
-		{
-			return json_encode($this->error);
-		}
-	}
-
-	public function onError($value)
-	{
-		$this->key = 1;
-		$this->error = array_merge($this->error, $value);
-	}
+        $this->obValidate = new Validate();
+
+    }
+
+    public function authRegister($name, $email, $username, $password, $mob)
+    {
+        $name = trim($name);
+        $email = trim($email);
+        $username = trim($username);
+        $password = trim($password);
+        $mob = trim($mob);
+        $userId = '';
+
+        if (empty($name)) {
+            $this->onError(["name" => " *Enter the name"]);
+        }
+
+        if(empty($email)) {
+            $this->onError(["email" => " *Enter the email address"]);
+        }
+        elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
+            $this->onError(["email" => " *Enter correct Email address"]);
+        }
+        else
+        {
+            if($this->obValidate->validateEmailInDb($email) === 1)
+            {
+
+                $this->onError(["email" => " *Email is already registered"]);
+            }
+        }
+
+        if(empty($username)) {
+            $this->onError(["username" => " *Enter the username"]);
+        }
+        else
+        {
+            if($this->obValidate->validateUsernameInDb($username) === 1)
+            {
+
+                $this->onError(["username" => " *Username is already registered"]);
+            }
+        }
+
+        if(empty($password)) {
+            $this->onError(["password" => " *Enter the password"]);
+        }
+
+        if(empty($mob)) {
+            $this->onError(["mob" => " *Enter the Mobile Number"]);
+        }
+        elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
+            $this->onError(["mob" => " *Enter correct Mobile Number"]);
+        }
+
+        if($this->key == 1)
+        {
+            return json_encode($this->error);
+        }
+        else
+        {
+            $this->key = 0;
+            $pass = md5($password);
+            $query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
+            if(!$this->connect->query($query)) {
+                $this->key = 1;
+                echo "You are not registered || Error in registration1";
+            }
+            else
+            {
+                $query = "SELECT id FROM register WHERE email = '$email'";
+                if($result = $this->connect->query($query)) {
+                    $row = $result->fetch_assoc();
+                    $userId = $row['id'];
+
+                    $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
+                    if(!$this->connect->query($query)) {
+                        $this->key = 1;
+                        echo "You are not registered || Error in registration2";
+                    }
+                    else
+                    {
+                        $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
+                        if(!$this->connect->query($query)) {
+                            $this->key = 1;
+                            echo "You are not registered || Error in registration3";
+                        }
+                    }
+                }
+            }
+        }
+        if ($this->key == 0) {
+            Session::put('start', $userId);
+            return json_encode([
+                "location" => getenv('APP_URL')."/account.php"
+            ]);
+        }
+        else
+        {
+            return json_encode($this->error);
+        }
+    }
+
+    public function onError($value)
+    {
+        $this->key = 1;
+        $this->error = array_merge($this->error, $value);
+    }
 }

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";
 						}

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();
     }

src/Reply.php

Spacing +17 added lines, -17 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/config/database.php');
+require_once (dirname(__DIR__).'/config/database.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -31,37 +31,37 @@ 
     public function replyTo($msg)
     {
 
-        if(Session::get('start') != null && isset($msg))  //checks for session login and the value send
+        if (Session::get('start') != null && isset($msg))  //checks for session login and the value send
         {
             $userId = Session::get('start');
-            $msg = json_decode($msg);   //decode json value
+            $msg = json_decode($msg); //decode json value
             $identifier = $msg->name;
 
-            $receiverID = $identifier;  //stores id of the person whom message is to be sent
+            $receiverID = $identifier; //stores id of the person whom message is to be sent
 
-            if($identifier > $userId)    // geneate specific unique code to store messages
-                $identifier = $userId . ":" . $identifier;
+            if ($identifier > $userId)    // geneate specific unique code to store messages
+                $identifier = $userId.":".$identifier;
             else
-                $identifier = $identifier . ":" . $userId;
+                $identifier = $identifier.":".$userId;
 
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
 
-            $time = date("D d M Y H:i:s", time() + 16200);  // current time
+            $time = date("D d M Y H:i:s", time() + 16200); // current time
             $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time
 
             //the sender id must not be equal to current session id
-            if($reply != "" && $receiverID != $userId)
+            if ($reply != "" && $receiverID != $userId)
             {
                 // check whether the receiver is authorized or registered
                 $query = "SELECT * from login where login_id = '$receiverID'";
 
                 $result = $this->connect->query($query);
-                if($result->num_rows > 0)     // if true
+                if ($result->num_rows > 0)     // if true
                 {
                     //check whether he is sending message for thr first time or he has sent messages before
                     $query = "SELECT * from total_message where identifier = '$identifier'";
                     $result = $this->connect->query($query);
-                    if($result->num_rows>0)               // if he has sent messages before
+                    if ($result->num_rows > 0)               // if he has sent messages before
                     {
                         // Update Total_Message Table
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
@@ -71,15 +71,15 @@ 
                     else    // if he sends message for the first time
                     {
                         $length = strlen($userId);
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
+                        if (substr($identifier, 0, $length) == $userId) // generate specific unique code
                         {
-                            $user2 = substr($identifier, $length+1);
+                            $user2 = substr($identifier, $length + 1);
                             $user1 = $userId;
                         }
                         else
                         {
                             $user2 = $userId;
-                            $length = strlen($identifier) - $length-1;
+                            $length = strlen($identifier) - $length - 1;
                             $user1 = substr($identifier, 0, $length);
                         }
                         // insert Details in Total_Message Table
@@ -102,13 +102,13 @@ 
 
     public function updateMessages($query, $identifier, $reply, $userId, $time)
     {
-        if($result = $this->connect->query($query))
+        if ($result = $this->connect->query($query))
         {
             //insert message in db
             $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
-                echo "Messages is sent \n";    // if query is executed return true
+                echo "Messages is sent \n"; // if query is executed return true
             }
             else
             {

Braces +22 added lines, -17 removed lines

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