ankitjain28may / openchat

src/Compose.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 
 /**
 *
@@ -23,18 +23,18 @@ 
     public function SelectUser($msg)
     {
         $msg = $msg->value;
-        if(isset($_SESSION['start']) && isset($msg))
+        if (isset($_SESSION['start']) && isset($msg))
         {
             $id = $_SESSION['start'];
             $suggestion = trim($msg);
-            if($suggestion != "" )
+            if ($suggestion != "")
             {
                 $query = "SELECT * FROM login where login_id != '$id' 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]);
                         }

Braces +3 added lines, -6 removed lines

@@ -40,18 +40,15 @@
                         }
                         $this->array = array_merge([], ["Compose" => $this->array]);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode(["Compose" => "Not Found"]);
                     }
-                }
-                else
+                } else
                 {
                     return json_encode(["Compose" => "Query Failed"]);
                 }
-            }
-            else
+            } else
             {
                 return json_encode(["Compose" => "Not Found"]);
             }

src/Time.php

Spacing +7 added lines, -7 removed lines

@@ -16,14 +16,14 @@
     function TimeConversion($time)
     {
 
-        if(substr($time,4,11) == date("d M Y", time() + 16200))
-            $time = substr($time,16,5);
-        else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7)
-            $time = substr($time,0,3);
-        else if(substr($time,11,4) == date("Y", time() + 16200))
-            $time = substr($time,4,6);
+        if (substr($time, 4, 11) == date("d M Y", time() + 16200))
+            $time = substr($time, 16, 5);
+        else if (substr($time, 7, 8) == date("M Y", time() + 16200) && substr($time, 4, 2) - date("d") < 7)
+            $time = substr($time, 0, 3);
+        else if (substr($time, 11, 4) == date("Y", time() + 16200))
+            $time = substr($time, 4, 6);
         else
-            $time = substr($time,4,11);
+            $time = substr($time, 4, 11);
 
         return $time;
     }

Braces +9 added lines, -8 removed lines

@@ -16,14 +16,15 @@
     function TimeConversion($time)
     {
 
-        if(substr($time,4,11) == date("d M Y", time() + 16200))
-            $time = substr($time,16,5);
-        else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7)
-            $time = substr($time,0,3);
-        else if(substr($time,11,4) == date("Y", time() + 16200))
-            $time = substr($time,4,6);
-        else
-            $time = substr($time,4,11);
+        if(substr($time,4,11) == date("d M Y", time() + 16200)) {
+                    $time = substr($time,16,5);
+        } else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) {
+                    $time = substr($time,0,3);
+        } else if(substr($time,11,4) == date("Y", time() + 16200)) {
+                    $time = substr($time,4,6);
+        } else {
+                    $time = substr($time,4,11);
+        }
 
         return $time;
     }

src/Models/message.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class Message extends Model
 {
-    protected $table='message';
+    protected $table = 'message';
 
     protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time'];
 }

src/User.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 
 /**
 * For retreiving User Information
@@ -21,12 +21,12 @@ 
 
     function UserDetails($id, $para)
     {
-        if($para == True)
+        if ($para == True)
             $this->query = "SELECT * from login where login_id = '$id'";
         else
             $this->query = "SELECT * from login where username = '$id'";
         $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

@@ -21,17 +21,19 @@
 
     function UserDetails($id, $para)
     {
-        if($para == True)
-            $this->query = "SELECT * from login where login_id = '$id'";
-        else
-            $this->query = "SELECT * from login where username = '$id'";
+        if($para == True) {
+                    $this->query = "SELECT * from login where login_id = '$id'";
+        } else {
+                    $this->query = "SELECT * from login where username = '$id'";
+        }
         $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/Conversation.php

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\Time;
 use ChatApp\User;
 
@@ -30,7 +30,7 @@ 
     {
 
         $flag = 1;
-        if(isset($_SESSION['start']) && isset($msg))
+        if (isset($_SESSION['start']) && isset($msg))
         {
             $add_load = 0;
             $id = $_SESSION['start'];
@@ -40,25 +40,25 @@ 
 
             $fetch = $this->obUser->UserDetails($username, $para);
 
-            if($fetch != NULL)
+            if ($fetch != NULL)
             {
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $id)
+                if ($login_id > $id)
                     $identifier = $id.':'.$login_id;
                 else
                     $identifier = $login_id.':'.$id;
 
                 $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;
@@ -66,14 +66,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' => $id]);
+                            $row = array_merge($row, ['start' => $id]);
                             $this->array = array_merge($this->array, [$row]);
                         }
 

Braces +14 added lines, -16 removed lines

@@ -45,10 +45,11 @@ 
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($login_id > $id)
-                    $identifier = $id.':'.$login_id;
-                else
-                    $identifier = $login_id.':'.$id;
+                if($login_id > $id) {
+                                    $identifier = $id.':'.$login_id;
+                } else {
+                                    $identifier = $login_id.':'.$id;
+                }
 
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
                 if($result = $this->connect->query($query))
@@ -57,11 +58,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;
+                            }
                     }
                 }
 
@@ -79,23 +81,19 @@ 
 
                         $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'type' => 1]], $this->array);
                         return json_encode($this->array);
-                    }
-                    else
+                    } else
                     {
                         return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'type' => 0]]);
                     }
-                }
-                else
+                } else
                 {
                     echo "Query Failed";
                 }
-            }
-            else
+            } else
             {
                 echo "Query Failed";
             }
-        }
-        else
+        } else
         {
             header('Location:../login.php');
         }

src/Search.php

Spacing +9 added lines, -9 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\Time;
 
 /**
@@ -28,24 +28,24 @@ 
     {
         $suggestion = $suggestion->value;
         $flag = 0;
-        if(isset($_SESSION['start']) && isset($suggestion))
+        if (isset($_SESSION['start']) && isset($suggestion))
         {
             $id = $_SESSION['start'];
             $suggestion = trim($suggestion);
-            if($suggestion != "")
+            if ($suggestion != "")
             {
                 $query = "SELECT * FROM login where login_id != '$id' 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 = '$id') or (user2 = '$check_id' and user1 = '$id')";
-                            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']);
@@ -57,7 +57,7 @@ 
                         }
                     }
                 }
-                if($flag != 0)
+                if ($flag != 0)
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);

Braces +4 added lines, -6 removed lines

@@ -61,16 +61,14 @@
                 {
                     $this->array = array_merge([], ["Search" => $this->array]);
                     return json_encode($this->array);
+                } else {
+                                    return json_encode(["Search" => "Not Found"]);
                 }
-                else
-                    return json_encode(["Search" => "Not Found"]);
-            }
-            else
+            } else
             {
                 return json_encode(["Search" => "Not Found"]);
             }
-        }
-        else
+        } else
         {
             return json_encode(["Search" => "Not Found"]);
         }

cmd.php

Indentation +9 added lines, -9 removed lines

@@ -8,16 +8,16 @@
 use ChatApp\Chat;
 
 $server =IoServer::factory(
-	new HttpServer(
-		new WsServer(
-			new Chat()
-			)
-		)
-	,
-	8080
-	);
+    new HttpServer(
+        new WsServer(
+            new Chat()
+            )
+        )
+    ,
+    8080
+    );
 $server->run();
 
 
 
- ?>
\ No newline at end of file
+    ?>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Ratchet\WebSocket\WsServer;
 use ChatApp\Chat;
 
-$server =IoServer::factory(
+$server = IoServer::factory(
 	new HttpServer(
 		new WsServer(
 			new Chat()

message.php

Indentation +1 added lines, -1 removed lines

@@ -131,6 +131,6 @@
 <?php
 }
 else{
-	header('Location:http://www.localhost/openchat/login.php');
+    header('Location:http://www.localhost/openchat/login.php');
 }
 ?>

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 session_start();
-if(isset($_SESSION['start']) and empty($_GET['user']))
+if (isset($_SESSION['start']) and empty($_GET['user']))
 {
 ?>
 <!DOCTYPE html>
@@ -130,7 +130,7 @@ 
 
 <?php
 }
-else{
+else {
 	header('Location:http://www.localhost/openchat/login.php');
 }
 ?>

Braces +1 added lines, -2 removed lines

@@ -129,8 +129,7 @@
 </html>
 
 <?php
-}
-else{
+} else{
 	header('Location:http://www.localhost/openchat/login.php');
 }
 ?>

registration-module/ajax/validate_register.php

Indentation +12 added lines, -12 removed lines

@@ -3,17 +3,17 @@
 require_once '../source/class.register.php';
 if(isset($_POST['q']))
 {
-	$register_field=json_decode($_POST['q']);
-	$name=$register_field->name;
-	$email=$register_field->email;
-	$username=$register_field->username;
-	$mob=$register_field->mob;
-	$password=$register_field->password;
-	$ob = new register();
-	$result=$ob->_register($name,$email,$username,$password,$mob);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
+    $register_field=json_decode($_POST['q']);
+    $name=$register_field->name;
+    $email=$register_field->email;
+    $username=$register_field->username;
+    $mob=$register_field->mob;
+    $password=$register_field->password;
+    $ob = new register();
+    $result=$ob->_register($name,$email,$username,$password,$mob);
+    if(isset($result))
+        echo $result;
+    else
+        echo json_encode([]);
 }
 ?>
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -1,17 +1,17 @@
 <?php
 session_start();
 require_once '../source/class.register.php';
-if(isset($_POST['q']))
+if (isset($_POST['q']))
 {
-	$register_field=json_decode($_POST['q']);
-	$name=$register_field->name;
-	$email=$register_field->email;
-	$username=$register_field->username;
-	$mob=$register_field->mob;
-	$password=$register_field->password;
+	$register_field = json_decode($_POST['q']);
+	$name = $register_field->name;
+	$email = $register_field->email;
+	$username = $register_field->username;
+	$mob = $register_field->mob;
+	$password = $register_field->password;
 	$ob = new register();
-	$result=$ob->_register($name,$email,$username,$password,$mob);
-	if(isset($result))
+	$result = $ob->_register($name, $email, $username, $password, $mob);
+	if (isset($result))
 		echo $result;
 	else
 		echo json_encode([]);

Braces +6 added lines, -5 removed lines

@@ -11,9 +11,10 @@
 	$password=$register_field->password;
 	$ob = new register();
 	$result=$ob->_register($name,$email,$username,$password,$mob);
-	if(isset($result))
-		echo $result;
-	else
-		echo json_encode([]);
-}
+	if(isset($result)) {
+			echo $result;
+	} else {
+			echo json_encode([]);
+	}
+	}
 ?>
\ No newline at end of file