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

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

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

src/Time.php

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

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

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

src/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'";

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

Braces +5 added lines, -10 removed lines

@@ -30,8 +30,7 @@ 
 		{
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
-		}
-		elseif (preg_match("/^[@]{1}$/", $login))
+		} elseif (preg_match("/^[@]{1}$/", $login))
 		{
 			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
 			{
@@ -42,8 +41,7 @@ 
 		if(empty($password)) {
 			$this->key = 1;
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
-		}
-		else
+		} else
 		{
 			$password = md5($password);
 		}
@@ -66,23 +64,20 @@ 
 							return json_encode([
 								"location" => URL."/account.php"
 							]);
-						}
-						else
+						} else
 						{
 							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
 							return json_encode($this->error);
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
 					return json_encode($this->error);
 				}
 			}
 
-		}
-		else
+		} else
 		{
 			return json_encode($this->error);
 		}