ankitjain28may / openchat

src/Chat.php

Doc Comments +20 added lines

@@ -26,6 +26,9 @@ 
         echo "New connection! ({$conn->resourceId})\n";
     }
 
+    /**
+     * @param ConnectionInterface $conn
+     */
     public function setID($conn)
     {
         session_id($conn->WebSocket->request->getCookies()['PHPSESSID']);
@@ -126,30 +129,47 @@ 
         return $obSidebar->LoadSideBar($data);
     }
 
+    /**
+     * @param string $data
+     * @param boolean $para
+     */
     public function onConversation($data, $para, $sessionId)
     {
         $obConversation = new Conversation($sessionId);
         return $obConversation->ConversationLoad($data, $para);
     }
 
+    /**
+     * @param string $data
+     * @param boolean $para
+     */
     public function onReceiver($data, $para, $sessionId)
     {
         $obReceiver = new Receiver($sessionId);
         return $obReceiver->ReceiverLoad($data, True);
     }
 
+    /**
+     * @param string $data
+     */
     public function onSearch($data, $sessionId)
     {
         $obSearch = new Search($sessionId);
         return $obSearch->SearchItem(json_decode($data));
     }
 
+    /**
+     * @param string $data
+     */
     public function onCompose($data, $sessionId)
     {
         $obCompose = new Compose($sessionId);
         return $obCompose->SelectUser(json_decode($data));
     }
 
+    /**
+     * @param string $data
+     */
     public function onReply($data, $sessionId)
     {
         $obReply = new Reply($sessionId);

Unused Use Statements -2 removed lines

@@ -2,11 +2,9 @@
 namespace ChatApp;
 use Ratchet\MessageComponentInterface;
 use Ratchet\ConnectionInterface;
-use ChatApp\Models\Message;
 use ChatApp\Reply;
 use ChatApp\Conversation;
 use ChatApp\Receiver;
-use ChatApp\SideBar;
 use ChatApp\Search;
 use ChatApp\Compose;
 

Braces +6 added lines, -12 removed lines

@@ -52,28 +52,23 @@ 
 
             $initial->conversation[0]->login_status = $this->online;
             $from->send(json_encode($initial));
-        }
-        elseif ($msg == 'Load Sidebar')
+        } elseif ($msg == 'Load Sidebar')
         {
             @$initial->initial = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($initial));
-        }
-        elseif (@json_decode($msg)->newConversation == 'Initiated')
+        } elseif (@json_decode($msg)->newConversation == 'Initiated')
         {
             @$result->conversation = json_decode($this->onConversation($msg, False, $sessionId));
             $from->send(json_encode($result));
-        }
-        elseif (@json_decode($msg)->search == 'search')
+        } elseif (@json_decode($msg)->search == 'search')
         {
             $searchResult = $this->onSearch($msg, $sessionId);
             $from->send($searchResult);
-        }
-        elseif (@json_decode($msg)->Compose == 'Compose')
+        } elseif (@json_decode($msg)->Compose == 'Compose')
         {
             $composeResult = $this->onCompose($msg, $sessionId);
             $from->send($composeResult);
-        }
-        else
+        } else
         {
             $this->onReply($msg, $sessionId);
 
@@ -97,8 +92,7 @@ 
 
                     $client->send(json_encode($result));
                     $this->online = 1;
-                }
-                elseif($client == $from)
+                } elseif($client == $from)
                 {
                     @$result->sidebar = json_decode($this->onSidebar($client->userId));
 

Spacing +5 added lines, -5 removed lines

@@ -38,9 +38,9 @@ 
 
     public function onMessage(ConnectionInterface $from, $msg) {
         $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID'];
-        if($msg == 'OpenChat initiated..!')
+        if ($msg == 'OpenChat initiated..!')
         {
-            $initial = (object) array();
+            $initial = (object)array();
             $initial->initial = json_decode($this->onSidebar($from->userId));
 
             $initial->conversation = json_decode(
@@ -56,13 +56,13 @@ 
         }
         elseif ($msg == 'Load Sidebar')
         {
-            $sidebar = (object) array();
+            $sidebar = (object)array();
             $sidebar->sidebar = json_decode($this->onSidebar($from->userId));
             $from->send(json_encode($sidebar));
         }
         elseif (@json_decode($msg)->newConversation == 'Initiated')
         {
-            $result = (object) array();
+            $result = (object)array();
             $result->conversation = json_decode($this->onConversation($msg, False, $sessionId));
             $from->send(json_encode($result));
         }
@@ -102,7 +102,7 @@ 
                     $client->send(json_encode($receiveResult));
                     $this->online = 1;
                 }
-                elseif($client == $from)
+                elseif ($client == $from)
                 {
                     $sentResult->sidebar = json_decode($this->onSidebar($client->userId));
 

src/Reply.php

Doc Comments +5 added lines

@@ -90,6 +90,11 @@
         $this->connect->close();
     }
 
+    /**
+     * @param string $identifier
+     * @param string $reply
+     * @param string $time
+     */
     function UpdateMessages($query, $identifier, $reply, $id, $time)
     {
         if($result = $this->connect->query($query))

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

Spacing +17 added lines, -17 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 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
             {

src/Compose.php

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

Spacing +6 added lines, -6 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 Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -34,18 +34,18 @@ 
     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]);
                         }

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/Search.php

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

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/SideBar.php

Braces +4 added lines, -9 removed lines

@@ -38,27 +38,22 @@
                         if($substring != $userId)
                         {
                             $this->Data($substring, $row);
-                        }
-
-                        else
+                        } else
                         {
                             $substring = substr($identifier, $length+1);
                             $this->Data($substring, $row);
                         }
                     }
                     return json_encode($this->array);
-                }
-                else
+                } else
                 {
                     return json_encode(null);
                 }
-            }
-            else
+            } else
             {
                 echo "Query Failed";
             }
-        }
-        else
+        } else
         {
             header('Location:../login.php');
         }

Spacing +8 added lines, -8 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 Dotenv\Dotenv;
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -32,26 +32,26 @@ 
 
     public function loadSideBar($userId)
     {
-        if(isset($userId))
+        if (isset($userId))
         {
             $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId'  ORDER BY id DESC";
-            if($result = $this->connect->query($query))
+            if ($result = $this->connect->query($query))
             {
                 if ($result->num_rows > 0)
                 {
                     $length = strlen($userId);
-                    while($row = $result->fetch_assoc())
+                    while ($row = $result->fetch_assoc())
                     {
                         $identifier = $row['identifier'];
                         $substring = substr($identifier, 0, $length);
-                        if($substring != $userId)
+                        if ($substring != $userId)
                         {
                             $this->data($substring, $row);
                         }
 
                         else
                         {
-                            $substring = substr($identifier, $length+1);
+                            $substring = substr($identifier, $length + 1);
                             $this->Data($substring, $row);
                         }
                     }
@@ -77,9 +77,9 @@ 
     public function data($userId, $row)
     {
         $query = "SELECT username, name, login_status, login_id from login where login_id = '$userId'";
-        if($result = $this->connect->query($query))
+        if ($result = $this->connect->query($query))
         {
-            if($result->num_rows > 0)
+            if ($result->num_rows > 0)
             {
                 $fetch = $result->fetch_assoc();
                 $row['time'] = $this->obTime->timeConversion($row['time']);

cmd.php

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

Indentation +8 added lines, -8 removed lines

@@ -8,12 +8,12 @@
 use ChatApp\Chat;
 
 $server =IoServer::factory(
-	new HttpServer(
-		new WsServer(
-			new Chat()
-			)
-		)
-	,
-	8080
-	);
+    new HttpServer(
+        new WsServer(
+            new Chat()
+            )
+        )
+    ,
+    8080
+    );
 $server->run();

src/Validate.php

Braces +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
 		{
 			if ($result->num_rows>0) {
 				return 1;
+			} else {
+							return 0;
 			}
-			else
-				return 0;
 		}
 	}
 
@@ -52,9 +52,9 @@ 
 		if ($result=$this->connect->query($query)) {
 			if ($result->num_rows>0) {
 				return 1;
+			} else {
+							return 0;
 			}
-			else
-				return 0;
 			
 		}
 	}

Indentation +28 added lines, -28 removed lines

@@ -11,40 +11,40 @@
 */
 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;
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?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();