ankitjain28may / openchat

registration-module/source/class.validate.php

Doc Comments +6 added lines

@@ -33,6 +33,9 @@ 
 		}	
 	}
 	
+	/**
+	 * @param string $email
+	 */
 	function validate_email_in_db($email)
 	{
 		$query="SELECT login_id FROM login WHERE email='$email'";
@@ -46,6 +49,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $username
+	 */
 	function validate_username_in_db($username)
 	{
 		$query="SELECT login_id FROM login WHERE username='$username'";

Indentation +36 added lines, -36 removed lines

@@ -3,23 +3,23 @@ 
 require_once 'database.php';
 class validate
 {
-	private $connect;
-	function __construct()
-	{
-		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
+    private $connect;
+    function __construct()
+    {
+        $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
 
-		$query="CREATE TABLE IF NOT EXISTS register (
+        $query="CREATE TABLE IF NOT EXISTS register (
 			id int primary key auto_increment unique not null,
 			email varchar(255) unique not null,
 			username varchar(255) unique not null,
 			password varchar(255) not null
 			) ENGINE=INNODB;";
 
-		if (!$this->connect->query($query)) {
-			echo "Table is not created || Query failed";
-		}
+        if (!$this->connect->query($query)) {
+            echo "Table is not created || Query failed";
+        }
 
-			$query="CREATE TABLE IF NOT EXISTS login (
+            $query="CREATE TABLE IF NOT EXISTS login (
 			login_id int primary key not null,
 			name varchar(255) not null,
 			email varchar(255) unique not null,
@@ -28,34 +28,34 @@ 
 			FOREIGN KEY (login_id) REFERENCES register(id)
 			) ENGINE=INNODB;";
 		
-		if (!$this->connect->query($query)) {
-			echo "Table is not created || Query failed";
-		}	
-	}
+        if (!$this->connect->query($query)) {
+            echo "Table is not created || Query failed";
+        }	
+    }
 	
-	function validate_email_in_db($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 validate_email_in_db($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 validate_username_in_db($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 validate_username_in_db($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;
 			
-		}
-	}
+        }
+    }
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 	{
 		$this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
 
-		$query="CREATE TABLE IF NOT EXISTS register (
+		$query = "CREATE TABLE IF NOT EXISTS register (
 			id int primary key auto_increment unique not null,
 			email varchar(255) unique not null,
 			username varchar(255) unique not null,
@@ -19,7 +19,7 @@ 
 			echo "Table is not created || Query failed";
 		}
 
-			$query="CREATE TABLE IF NOT EXISTS login (
+			$query = "CREATE TABLE IF NOT EXISTS login (
 			login_id int primary key not null,
 			name varchar(255) not null,
 			email varchar(255) unique not null,
@@ -35,10 +35,10 @@ 
 	
 	function validate_email_in_db($email)
 	{
-		$query="SELECT login_id FROM login WHERE email='$email'";
-		if ($result=$this->connect->query($query)) 
+		$query = "SELECT login_id FROM login WHERE email='$email'";
+		if ($result = $this->connect->query($query)) 
 		{
-			if ($result->num_rows>0) {
+			if ($result->num_rows > 0) {
 				return 1;
 			}
 			else
@@ -48,9 +48,9 @@ 
 
 	function validate_username_in_db($username)
 	{
-		$query="SELECT login_id FROM login WHERE username='$username'";
-		if ($result=$this->connect->query($query)) {
-			if ($result->num_rows>0) {
+		$query = "SELECT login_id FROM login WHERE username='$username'";
+		if ($result = $this->connect->query($query)) {
+			if ($result->num_rows > 0) {
 				return 1;
 			}
 			else

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

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;
 

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
     public function onMessage(ConnectionInterface $from, $msg) {
         $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID'];
-        if($msg == 'OpenChat initiated..!')
+        if ($msg == 'OpenChat initiated..!')
         {
             @$initial->initial = json_decode($this->onSidebar($from->userId));
 
@@ -98,7 +98,7 @@ 
                     $client->send(json_encode($result));
                     $this->online = 1;
                 }
-                elseif($client == $from)
+                elseif ($client == $from)
                 {
                     @$result->sidebar = json_decode($this->onSidebar($client->userId));
 

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

src/Receiver.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace ChatApp;
 require_once (dirname(__DIR__) . '/database.php');
 use ChatApp\User;
-use ChatApp\Time;
 use ChatApp\Conversation;
 /**
 *

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\User;
 use ChatApp\Time;
 use ChatApp\Conversation;
@@ -31,7 +31,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/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))

Spacing +15 added lines, -15 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 
 /**
 * Store Message in the Database
@@ -21,37 +21,37 @@ 
     function replyTo($msg)
     {
 
-        if(isset($_SESSION['start']) && isset($msg))  //checks for session login and the value send
+        if (isset($_SESSION['start']) && isset($msg))  //checks for session login and the value send
         {
             $id = $_SESSION['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 > $id)    // geneate specific unique code to store messages
+            if ($identifier > $id)    // geneate specific unique code to store messages
                 $identifier = $id.":".$identifier;
             else
                 $identifier = $identifier.":".$id;
 
             $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 != $id)
+            if ($reply != "" && $receiverID != $id)
             {
                 // 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'";
@@ -61,15 +61,15 @@ 
                     else    // if he sends message for the first time
                     {
                         $length = strlen($id);
-                        if(substr($identifier, 0, $length) == $id) // generate specific unique code
+                        if (substr($identifier, 0, $length) == $id) // generate specific unique code
                         {
-                            $user2 = substr($identifier, $length+1);
+                            $user2 = substr($identifier, $length + 1);
                             $user1 = $id;
                         }
                         else
                         {
                             $user2 = $id;
-                            $length = strlen($identifier) - $length-1;
+                            $length = strlen($identifier) - $length - 1;
                             $user1 = substr($identifier, 0, $length);
                         }
                         // insert Details in Total_Message Table
@@ -92,13 +92,13 @@ 
 
     function UpdateMessages($query, $identifier, $reply, $id, $time)
     {
-        if($result = $this->connect->query($query))
+        if ($result = $this->connect->query($query))
         {
             //insert message in db
             $query = "INSERT into messages values('$identifier', '$reply', '$id', '$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

@@ -21,18 +21,22 @@ 
     function replyTo($msg)
     {
 
-        if(isset($_SESSION['start']) && isset($msg))  //checks for session login and the value send
+        if(isset($_SESSION['start']) && isset($msg)) {
+            //checks for session login and the value send
         {
             $id = $_SESSION['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 > $id)    // geneate specific unique code to store messages
+            if($identifier > $id) {
+                // geneate specific unique code to store messages
                 $identifier = $id.":".$identifier;
-            else
-                $identifier = $identifier.":".$id;
+            } else {
+                            $identifier = $identifier.":".$id;
+            }
 
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
 
@@ -46,27 +50,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, $id, $time);
 
-                    }
-                    else    // if he sends message for the first time
+                    } else    // if he sends message for the first time
                     {
                         $length = strlen($id);
-                        if(substr($identifier, 0, $length) == $id) // generate specific unique code
+                        if(substr($identifier, 0, $length) == $id) {
+                            // generate specific unique code
                         {
                             $user2 = substr($identifier, $length+1);
-                            $user1 = $id;
                         }
-                        else
+                            $user1 = $id;
+                        } else
                         {
                             $user2 = $id;
                             $length = strlen($identifier) - $length-1;
@@ -76,14 +84,12 @@ 
                         $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";
                         $this->UpdateMessages($query, $identifier, $reply, $id, $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";
         }
@@ -99,8 +105,7 @@ 
             if($result = $this->connect->query($query))
             {
                 echo "Messages is sent \n";    // if query is executed return true
-            }
-            else
+            } else
             {
                 echo "Message is failed";
             }

src/SideBar.php

Doc Comments +3 added lines

@@ -65,6 +65,9 @@
         $this->connect->close();
     }
 
+    /**
+     * @param string $id
+     */
     function Data($id, $row)
     {
         $query = "SELECT username,name,login_status,login_id from login where login_id = '$id'";

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\Time;
 
 /**
@@ -23,26 +23,26 @@ 
 
     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);
                         }
                     }
@@ -68,9 +68,9 @@ 
     function Data($id, $row)
     {
         $query = "SELECT username,name,login_status,login_id from login where login_id = '$id'";
-        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']);

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

register.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 session_start();
-if(isset($_SESSION['start']))
+if (isset($_SESSION['start']))
 {
     header("Location: account.php");
 }

login.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 session_start();
-if(isset($_SESSION['start']))
+if (isset($_SESSION['start']))
 {
     header("Location: account.php");
 }

database.php

Indentation +5 added lines, -5 removed lines

@@ -1,7 +1,7 @@
 <?php
-  // Define database connection constants
-  define('DB_HOST', 'localhost');
-  define('DB_USER', 'root');
-  define('DB_PASSWORD','');
-  define('DB_NAME', 'openchat');
+    // Define database connection constants
+    define('DB_HOST', 'localhost');
+    define('DB_USER', 'root');
+    define('DB_PASSWORD','');
+    define('DB_NAME', 'openchat');
 ?>

Spacing +1 added lines, -1 removed lines

@@ -2,6 +2,6 @@
   // Define database connection constants
   define('DB_HOST', 'localhost');
   define('DB_USER', 'root');
-  define('DB_PASSWORD','');
+  define('DB_PASSWORD', '');
   define('DB_NAME', 'openchat');
 ?>

index.php

Indentation +8 added lines, -8 removed lines

@@ -16,21 +16,21 @@
 			<a id="brand" href="#">OpenChat</a>
 			<ul class="nav-right">
 				<?php if(isset($_SESSION['start']))
-				{
-				?>
+                {
+                ?>
 				<li><a href="account.php">Account</a></li>
 				<li><a href="message.php">Message</a></li>
 				<li><a href="registration-module/source/class.logout.php">Log out</a></li>
 				<?php 
-				}
-				else
-				{
-				?>
+                }
+                else
+                {
+                ?>
 				<li><a href="login.php">Login</a></li>
 				<li><a href="register.php">Register</a></li>
 				<?php
-				}
-				?>
+                }
+                ?>
 			</ul>
 		</div>
 

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 		<div class="header">
 			<a id="brand" href="#">OpenChat</a>
 			<ul class="nav-right">
-				<?php if(isset($_SESSION['start']))
+				<?php if (isset($_SESSION['start']))
 				{
 				?>
 				<li><a href="account.php">Account</a></li>

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
 				<li><a href="message.php">Message</a></li>
 				<li><a href="registration-module/source/class.logout.php">Log out</a></li>
 				<?php 
-				}
-				else
+				} else
 				{
 				?>
 				<li><a href="login.php">Login</a></li>