ankitjain28may / 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>
 

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>

account.php

Braces +21 added lines, -23 removed lines

@@ -22,9 +22,7 @@ 
 		}
 	}
 
-}
-
-else if($user)
+} else if($user)
 {
 	$query="SELECT * from login where username='$user'";
 	if($result=$connect->query($query))
@@ -42,8 +40,7 @@ 
 					$row=array_merge($row,$r);
 					// var_dump($row);
 				}
-			}
-			else
+			} else
 			{
 				die("error");
 			}
@@ -67,8 +64,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>
@@ -92,16 +88,21 @@ 
 				<div class="brief">
 					<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
 					<?php foreach ($row as $key => $value) {
-						if($key=='username' and $value!=null)
-							echo '<p>Username: '.$row["username"] .'</p><br>';
-						if($key=='email' and $value!=null)
-							echo '<p>Email Id: '.$row["email"] .'</p><br>';
-						if($key=='status' and $value!=null)
-							echo '<p>Status: '.$row["status"] .'</p><br>';
-						if($key=='education' and $value!=null)
-							echo '<p>Education: '.$row["education"] .'</p><br>';
-						if($key=='gender' and $value!=null)
-							echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+						if($key=='username' and $value!=null) {
+													echo '<p>Username: '.$row["username"] .'</p><br>';
+						}
+						if($key=='email' and $value!=null) {
+													echo '<p>Email Id: '.$row["email"] .'</p><br>';
+						}
+						if($key=='status' and $value!=null) {
+													echo '<p>Status: '.$row["status"] .'</p><br>';
+						}
+						if($key=='education' and $value!=null) {
+													echo '<p>Education: '.$row["education"] .'</p><br>';
+						}
+						if($key=='gender' and $value!=null) {
+													echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+						}
 					}
 					?>
 				</div>	
@@ -152,18 +153,15 @@ 
 
 
 <?php
-		}
-		else
+		} else
 		{
 			die("Invalid User");
 		}
-	}
-	else
+	} else
 	{
 		die("invalid");
 	}
-}
-else
+} else
 {
 	header("Location:http://localhost/openchat/index.php");
 }

Indentation +72 added lines, -72 removed lines

@@ -11,43 +11,43 @@ 
 var_dump($user);
 if(isset($_SESSION['start']) and !$user)
 {
-	$login_id=$_SESSION['start'];
-	$query="SELECT username from login where login_id='$login_id'";
-	if($result=$connect->query($query))
-	{
-		if($result->num_rows >0)
-		{
-			$row=$result->fetch_assoc();
-			$location="http://localhost/openchat/account.php/".$row['username'];
-			header("Location:".$location);
-		}
-	}
+    $login_id=$_SESSION['start'];
+    $query="SELECT username from login where login_id='$login_id'";
+    if($result=$connect->query($query))
+    {
+        if($result->num_rows >0)
+        {
+            $row=$result->fetch_assoc();
+            $location="http://localhost/openchat/account.php/".$row['username'];
+            header("Location:".$location);
+        }
+    }
 
 }
 
 else if($user)
 {
-	$query="SELECT * from login where username='$user'";
-	if($result=$connect->query($query))
-	{
-		if($result->num_rows >0)
-		{
-			$row=$result->fetch_assoc();
-			$id=$row['login_id'];
-			$query="SELECT * from profile where login_id='$id'";
-			if($result=$connect->query($query))
-			{
-				if($result->num_rows>0)
-				{
-					$r=$result->fetch_assoc();
-					$row=array_merge($row,$r);
-					// var_dump($row);
-				}
-			}
-			else
-			{
-				die("error");
-			}
+    $query="SELECT * from login where username='$user'";
+    if($result=$connect->query($query))
+    {
+        if($result->num_rows >0)
+        {
+            $row=$result->fetch_assoc();
+            $id=$row['login_id'];
+            $query="SELECT * from profile where login_id='$id'";
+            if($result=$connect->query($query))
+            {
+                if($result->num_rows>0)
+                {
+                    $r=$result->fetch_assoc();
+                    $row=array_merge($row,$r);
+                    // var_dump($row);
+                }
+            }
+            else
+            {
+                die("error");
+            }
 ?>
 	<head>
 		<title>OpenChat || Profile</title>
@@ -63,20 +63,20 @@ 
             <ul class="nav-right">
                 <li><a href="../index.php">About</a></li>
                 <?php if(isset($_SESSION['start']))
-				{
-				?>
+                {
+                ?>
 				<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>
 
@@ -93,32 +93,32 @@ 
 				<div class="brief">
 					<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
 					<?php foreach ($row as $key => $value) {
-						if($key=='username' and $value!=null)
-							echo '<p>Username: '.$row["username"] .'</p><br>';
-						if($key=='email' and $value!=null)
-							echo '<p>Email Id: '.$row["email"] .'</p><br>';
-						if($key=='status' and $value!=null)
-							echo '<p>Status: '.$row["status"] .'</p><br>';
-						if($key=='education' and $value!=null)
-							echo '<p>Education: '.$row["education"] .'</p><br>';
-						if($key=='gender' and $value!=null)
-							echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
-					}
-					?>
+                        if($key=='username' and $value!=null)
+                            echo '<p>Username: '.$row["username"] .'</p><br>';
+                        if($key=='email' and $value!=null)
+                            echo '<p>Email Id: '.$row["email"] .'</p><br>';
+                        if($key=='status' and $value!=null)
+                            echo '<p>Status: '.$row["status"] .'</p><br>';
+                        if($key=='education' and $value!=null)
+                            echo '<p>Education: '.$row["education"] .'</p><br>';
+                        if($key=='gender' and $value!=null)
+                            echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+                    }
+                    ?>
 				</div>
 				<?php if($_SESSION['start']==$row['login_id'])
-				{
-					?>
+                {
+                    ?>
 				<div class="edit"><a href="#">Edit Profile</a></div>
 				<?php
-				}
-				?>
+                }
+                ?>
 			</div>
 
 			<?php
-			if($_SESSION['start']==$row['login_id'])
-			{
-				?>
+            if($_SESSION['start']==$row['login_id'])
+            {
+                ?>
 
 			<div class="boxx" id="profile">
 				<form method="post" action="../profile_generate.php">
@@ -133,8 +133,8 @@ 
 				</form>
 			</div>
 			<?php
-			}
-			?>
+            }
+            ?>
 		</div>
 
 
@@ -153,20 +153,20 @@ 
 
 
 <?php
-		}
-		else
-		{
-			die("Invalid User");
-		}
-	}
-	else
-	{
-		die("invalid");
-	}
+        }
+        else
+        {
+            die("Invalid User");
+        }
+    }
+    else
+    {
+        die("invalid");
+    }
 }
 else
 {
-	header("Location:http://localhost/openchat/index.php");
+    header("Location:http://localhost/openchat/index.php");
 }
 ?>
 

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

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

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

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

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