ankitjain28may / openchat

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

src/Profile.php

Braces +4 added lines, -3 removed lines

@@ -14,12 +14,13 @@
         $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME);
         $query = "SELECT * from profile where login_id = '$userId'";
         $result = $connect->query($query);
-        if($result->num_rows > 0)                   // if true
+        if($result->num_rows > 0) {
+            // if true
         {
             $details = $result->fetch_assoc();
-            return $details;
         }
-        else
+            return $details;
+        } else
         {
             return NULL;
         }

cmd.php

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

tests/ExistsTest.php

Indentation +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
     }
 
     /**
-    * @dataProvider ClassNameProvider
-    */
+     * @dataProvider ClassNameProvider
+     */
     public function testClassExists($className)
     {
         $this->assertTrue(class_exists($className));

views/logout.php

Braces +1 added lines, -2 removed lines

@@ -12,8 +12,7 @@
         header('Location: ../../index.php');
     }
 
-}
-else
+} else
 {
 	echo "Please Login";
 }

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

Indentation +1 added lines, -1 removed lines

@@ -175,6 +175,6 @@
 <?php
 }
 else{
-  header('Location:'. getenv('APP_URL')."/index.php");
+    header('Location:'. getenv('APP_URL')."/index.php");
 }
 ?>

views/profile_generate.php

Indentation +20 added lines, -20 removed lines

@@ -10,37 +10,37 @@
 $connect = mysqli_connect(
     getenv('DB_HOST'),
     getenv('DB_USER'),
-	getenv('DB_PASSWORD'),
-	getenv('DB_NAME')
+    getenv('DB_PASSWORD'),
+    getenv('DB_NAME')
 );
 
 $userId = Session::get('start');
 $data = '';
 if(isset($_POST['submit']))
 {
-	$data = Profile::getProfile($userId);
-	if($data != NULL):
-		$status = get($_POST['status'], $data['status']);
-		$edu = get($_POST['education'], $data['education']);
-		$gender = get($_POST['gender'], $data['gender']);
-		$query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
-		if($result = $connect->query($query))
-		{
-			header('Location:'.getenv('APP_URL').'/views/account.php');
-		}
-		else
-		{
-			header("Location:".getenv('APP_URL')."/views/error.php");
-		}
-	endif;
+    $data = Profile::getProfile($userId);
+    if($data != NULL):
+        $status = get($_POST['status'], $data['status']);
+        $edu = get($_POST['education'], $data['education']);
+        $gender = get($_POST['gender'], $data['gender']);
+        $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
+        if($result = $connect->query($query))
+        {
+            header('Location:'.getenv('APP_URL').'/views/account.php');
+        }
+        else
+        {
+            header("Location:".getenv('APP_URL')."/views/error.php");
+        }
+    endif;
 }
 else
 {
-	header("Location:".getenv('APP_URL')."/views/error.php");
+    header("Location:".getenv('APP_URL')."/views/error.php");
 }
 
 function get($value, $default)
 {
-	$value = trim($value);
-	return (isset($value) ? $value : $default);
+    $value = trim($value);
+    return (isset($value) ? $value : $default);
 }

Braces +2 added lines, -4 removed lines

@@ -18,14 +18,12 @@
 		if($result = $connect->query($query))
 		{
 			header('Location:'.URL.'/account.php');
-		}
-		else
+		} else
 		{
 			header("Location:".URL."/error.php");
 		}
 	endif;
-}
-else
+} else
 {
 	header("Location:".URL."/error.php");
 }

views/account.php

Indentation +36 added lines, -36 removed lines

@@ -14,26 +14,26 @@ 
 $userId = Session::get('start');
 if($userId != null && $user == "account.php")
 {
-	$obUser = new User();
-	$row = $obUser->userDetails($userId, True);
+    $obUser = new User();
+    $row = $obUser->userDetails($userId, True);
 
-	if($row != NULL)
-	{
-		$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
-		header("Location:".$location);
-	}
+    if($row != NULL)
+    {
+        $location = getenv('APP_URL') . "/views/account.php/". $row['username'];
+        header("Location:".$location);
+    }
 }
 elseif ($user != "account.php")
 {
-	$obUser = new User();
-	$row = $obUser->userDetails($user, False);
-	if($row != NULL):
-		$userId = $row['login_id'];
-		$details = Profile::getProfile($userId);
-		if($details != NULL)
-			$row = array_merge($row, $details);
-		else
-			header("Location:".getenv('APP_URL')."/views/error.php");
+    $obUser = new User();
+    $row = $obUser->userDetails($user, False);
+    if($row != NULL):
+        $userId = $row['login_id'];
+        $details = Profile::getProfile($userId);
+        if($details != NULL)
+            $row = array_merge($row, $details);
+        else
+            header("Location:".getenv('APP_URL')."/views/error.php");
 ?>
 
 		<!Doctype html>
@@ -68,18 +68,18 @@ 
 						<div class="brief">
 							<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
 							<?php foreach ($row as $key => $value) {
-								if($key =='username' && $value != null)
-									echo '<p>Username: '.$row["username"] .'</p><br>';
-								if($key == 'email' && $value != null)
-									echo '<p>Email Id: '.$row["email"] .'</p><br>';
-								if($key == 'status' && $value != null)
-									echo '<p>Status: '.$row["status"] .'</p><br>';
-								if($key == 'education' && $value != null)
-									echo '<p>Education: '.$row["education"] .'</p><br>';
-								if($key == 'gender' && $value != null)
-									echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
-							}
-							?>
+                                if($key =='username' && $value != null)
+                                    echo '<p>Username: '.$row["username"] .'</p><br>';
+                                if($key == 'email' && $value != null)
+                                    echo '<p>Email Id: '.$row["email"] .'</p><br>';
+                                if($key == 'status' && $value != null)
+                                    echo '<p>Status: '.$row["status"] .'</p><br>';
+                                if($key == 'education' && $value != null)
+                                    echo '<p>Education: '.$row["education"] .'</p><br>';
+                                if($key == 'gender' && $value != null)
+                                    echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+                            }
+                            ?>
 						</div>
 						<?php if(Session::get('start') == $row['login_id']): ?>
 							<div class="edit">
@@ -89,8 +89,8 @@ 
 					</div>
 
 					<?php
-						if(Session::get('start') == $row['login_id']):
-					?>
+                        if(Session::get('start') == $row['login_id']):
+                    ?>
 
 					<div class="boxx" id="profile">
 						<form method="post" action="../profile_generate.php">
@@ -105,8 +105,8 @@ 
 						</form>
 					</div>
 					<?php
-						endif;
-					?>
+                        endif;
+                    ?>
 				</div>
 
 				<div class="footer">
@@ -119,13 +119,13 @@ 
 			</body>
 		</html>
 <?php
-	else:
-		header("Location:".getenv('APP_URL')."/views/error.php");
-	endif;
+    else:
+        header("Location:".getenv('APP_URL')."/views/error.php");
+    endif;
 }
 else
 {
-	header("Location: ".getenv('APP_URL')."/views/");
+    header("Location: ".getenv('APP_URL')."/views/");
 }
 ?>
 

Braces +31 added lines, -22 removed lines

@@ -22,19 +22,19 @@ 
 		$location = getenv('APP_URL') . "/views/account.php/". $row['username'];
 		header("Location:".$location);
 	}
-}
-elseif ($user != "account.php")
+} elseif ($user != "account.php")
 {
 	$obUser = new User();
 	$row = $obUser->userDetails($user, False);
 	if($row != NULL):
 		$userId = $row['login_id'];
 		$details = Profile::getProfile($userId);
-		if($details != NULL)
-			$row = array_merge($row, $details);
-		else
-			header("Location:".getenv('APP_URL')."/views/error.php");
-?>
+		if($details != NULL) {
+					$row = array_merge($row, $details);
+		} else {
+					header("Location:".getenv('APP_URL')."/views/error.php");
+		}
+		?>
 
 		<!Doctype html>
 		<html>
@@ -51,10 +51,13 @@ 
 		                <?php if(Session::get('start') != null): ?>
 							<li><a href="../message.php">Message</a></li>
 							<li><a href="../logout.php">Log out</a></li>
-						<?php else: ?>
+						<?php else {
+    : ?>
 							<li><a href="../login.php">Login</a></li>
 							<li><a href="../register.php">Register</a></li>
-						<?php endif; ?>
+						<?php endif;
+}
+?>
 		            </ul>
 		        </div>
 
@@ -68,16 +71,21 @@ 
 						<div class="brief">
 							<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
 							<?php foreach ($row as $key => $value) {
-								if($key =='username' && $value != null)
-									echo '<p>Username: '.$row["username"] .'</p><br>';
-								if($key == 'email' && $value != null)
-									echo '<p>Email Id: '.$row["email"] .'</p><br>';
-								if($key == 'status' && $value != null)
-									echo '<p>Status: '.$row["status"] .'</p><br>';
-								if($key == 'education' && $value != null)
-									echo '<p>Education: '.$row["education"] .'</p><br>';
-								if($key == 'gender' && $value != null)
-									echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+								if($key =='username' && $value != null) {
+																	echo '<p>Username: '.$row["username"] .'</p><br>';
+								}
+								if($key == 'email' && $value != null) {
+																	echo '<p>Email Id: '.$row["email"] .'</p><br>';
+								}
+								if($key == 'status' && $value != null) {
+																	echo '<p>Status: '.$row["status"] .'</p><br>';
+								}
+								if($key == 'education' && $value != null) {
+																	echo '<p>Education: '.$row["education"] .'</p><br>';
+								}
+								if($key == 'gender' && $value != null) {
+																	echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
+								}
 							}
 							?>
 						</div>
@@ -119,11 +127,12 @@ 
 			</body>
 		</html>
 <?php
-	else:
+	else {
+	    :
 		header("Location:".getenv('APP_URL')."/views/error.php");
+	}
 	endif;
-}
-else
+} else
 {
 	header("Location: ".getenv('APP_URL')."/views/");
 }