ankitjain28may / openchat

src/Session.php

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

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

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

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

views/logout.php

Spacing +2 added lines, -2 removed lines

@@ -1,13 +1,13 @@
 <?php
 
-require (dirname(__DIR__) . '/vendor/autoload.php');
+require (dirname(__DIR__).'/vendor/autoload.php');
 use ChatApp\Session;
 use Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
 $dotenv->load();
 
 
-if(Session::get('start') != null)
+if (Session::get('start') != null)
 {
     Session::forget('start');
     header('Location:'.getenv('APP_URL')."/index.php");

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
         header('Location: ../../index.php');
     }
 
-}
-else
+} else
 {
 	echo "Please Login";
 }

views/message.php

Braces +1 added lines, -2 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -175,6 +175,6 @@
 <?php
 }
 else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+    header('Location:'. getenv('APP_URL')."/index.php");
 }
 ?>

Spacing +4 added lines, -4 removed lines

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