ankitjain28may / openchat

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

index.php

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>

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

Spacing +35 added lines, -35 removed lines

@@ -6,41 +6,41 @@ 
 session_start();
 include 'database.php';
 $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
-$user=explode("/", $_SERVER['REQUEST_URI']);
-$user = $user[count($user)-1];
+$user = explode("/", $_SERVER['REQUEST_URI']);
+$user = $user[count($user) - 1];
 var_dump($user);
-if(isset($_SESSION['start']) and !$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))
+	$login_id = $_SESSION['start'];
+	$query = "SELECT username from login where login_id='$login_id'";
+	if ($result = $connect->query($query))
 	{
-		if($result->num_rows >0)
+		if ($result->num_rows > 0)
 		{
-			$row=$result->fetch_assoc();
-			$location="http://localhost/openchat/account.php/".$row['username'];
+			$row = $result->fetch_assoc();
+			$location = "http://localhost/openchat/account.php/".$row['username'];
 			header("Location:".$location);
 		}
 	}
 
 }
 
-else if($user)
+else if ($user)
 {
-	$query="SELECT * from login where username='$user'";
-	if($result=$connect->query($query))
+	$query = "SELECT * from login where username='$user'";
+	if ($result = $connect->query($query))
 	{
-		if($result->num_rows >0)
+		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))
+			$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)
+				if ($result->num_rows > 0)
 				{
-					$r=$result->fetch_assoc();
-					$row=array_merge($row,$r);
+					$r = $result->fetch_assoc();
+					$row = array_merge($row, $r);
 					// var_dump($row);
 				}
 			}
@@ -62,7 +62,7 @@ 
             <a id="brand" href="">OpenChat</a>
             <ul class="nav-right">
                 <li><a href="../index.php">About</a></li>
-                <?php if(isset($_SESSION['start']))
+                <?php if (isset($_SESSION['start']))
 				{
 				?>
 				<li><a href="../message.php">Message</a></li>
@@ -93,20 +93,20 @@ 
 				<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'])
+				<?php if ($_SESSION['start'] == $row['login_id'])
 				{
 					?>
 				<div class="edit"><a href="#">Edit Profile</a></div>
@@ -116,7 +116,7 @@ 
 			</div>
 
 			<?php
-			if($_SESSION['start']==$row['login_id'])
+			if ($_SESSION['start'] == $row['login_id'])
 			{
 				?>
 
@@ -127,8 +127,8 @@ 
 					<label>Education : </label>
 					<input type="text" name="education" id="education" value="<?php echo $row['education']; ?>"></input>
 					<label>Gender : </label><br>
-					<input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender']=='Male')?'checked':'' ?>> Male<br>
-					<input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender']=='Female')?'checked':'' ?>> Female<br>
+					<input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender'] == 'Male') ? 'checked' : '' ?>> Male<br>
+					<input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender'] == 'Female') ? 'checked' : '' ?>> Female<br>
 					<input type="submit" name="submit" value="Done" id="submit">
 				</form>
 			</div>

src/Compose.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 
 /**
 *
@@ -23,18 +23,18 @@ 
     public function SelectUser($msg)
     {
         $msg = $msg->value;
-        if(isset($_SESSION['start']) && isset($msg))
+        if (isset($_SESSION['start']) && isset($msg))
         {
             $id = $_SESSION['start'];
             $suggestion = trim($msg);
-            if($suggestion != "" )
+            if ($suggestion != "")
             {
                 $query = "SELECT * FROM login where login_id != '$id' 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]);
                         }

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

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

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 
 /**
 * For retreiving User Information
@@ -21,12 +21,12 @@ 
 
     function UserDetails($id, $para)
     {
-        if($para == True)
+        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;

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

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

Spacing +12 added lines, -12 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 namespace ChatApp;
-require_once (dirname(__DIR__) . '/database.php');
+require_once (dirname(__DIR__).'/database.php');
 use ChatApp\Time;
 use ChatApp\User;
 
@@ -30,7 +30,7 @@ 
     {
 
         $flag = 1;
-        if(isset($_SESSION['start']) && isset($msg))
+        if (isset($_SESSION['start']) && isset($msg))
         {
             $add_load = 0;
             $id = $_SESSION['start'];
@@ -40,25 +40,25 @@ 
 
             $fetch = $this->obUser->UserDetails($username, $para);
 
-            if($fetch != NULL)
+            if ($fetch != NULL)
             {
                 $login_id = (int)$fetch['login_id'];
 
                 // Unique Identifier
-                if($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))
+                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;
@@ -66,14 +66,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' => $id]);
+                            $row = array_merge($row, ['start' => $id]);
                             $this->array = array_merge($this->array, [$row]);
                         }
 

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