mmainstreet / jodel-web

php/jodel-web.php

Spacing +40 added lines, -40 removed lines

@@ -126,7 +126,7 @@ 
 				}
 				else
 				{
-					error_log('User with JodelDeviceId:' . $deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+					error_log('User with JodelDeviceId:' . $deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
 				}
 			}
 
@@ -189,7 +189,7 @@ 
 	if(isset($_POST['color']))
 	{
 		$color = $_POST['color'];
-		switch ($color) {
+		switch($color) {
 			case '8ABDB0':
 				$color = '8ABDB0';
 				break;
@@ -241,9 +241,9 @@ 
 function isDeviceUidInDatabase($deviceUid)
 {
 	$db = new DatabaseConnect();  
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		return TRUE;
 	}
@@ -260,7 +260,7 @@ 
 	
 	$access_token;
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -277,7 +277,7 @@ 
 
 	if($expiration_date <= time()) {
 		$accountCreator = new CreateUser();
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
 		$accountCreator->setLocation($location);
 		$data = $accountCreator->execute();
@@ -292,7 +292,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -305,7 +305,7 @@ 
 	$db = new DatabaseConnect();  
 	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken . "'");
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -322,7 +322,7 @@ 
 
 	if($expiration_date <= time()) {
 		$accountCreator = new CreateUser();
-		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
+		$accountCreator->setAccessToken($access_token); //$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
 		$accountCreator->setLocation($location);
 		$data = $accountCreator->execute();
@@ -337,7 +337,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -352,7 +352,7 @@ 
 
 	$access_token;
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -384,7 +384,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -395,11 +395,11 @@ 
 function getLocationByAccessToken($accessToken)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE access_token='" . $accessToken . "'");
 	
 	$location = new Location();
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -420,11 +420,11 @@ 
 function getLocationByDeviceUid($deviceUid)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 	
 	$location = new Location();
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -445,11 +445,11 @@ 
 function getDeviceUidByAccessToken($accesstoken)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT device_uid FROM accounts WHERE access_token='" . $accesstoken  . "'");
+	$result = $db->query("SELECT device_uid FROM accounts WHERE access_token='" . $accesstoken . "'");
 	
 	$deviceUid;
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -468,11 +468,11 @@ 
 function getAccessTokenByDeviceUid($deviceUid)
 {
 	$db = new DatabaseConnect();
-	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 	
 	$accessToken;
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -540,7 +540,7 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId, type)
 					VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')");
 	
-	if($result === false){
+	if($result === false) {
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -568,11 +568,11 @@ 
 	$result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
 					expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
 					VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
-					"','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
+					"','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
 					"','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
 
 	$success = TRUE;
-	if($result === false){
+	if($result === false) {
 			$error = db_error();
 			echo $error;
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;
@@ -618,7 +618,7 @@ 
 {
 	preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
 
-    return (isset($matches[0])) ? true : false;
+    return (isset($matches[0]))?true : false;
 }
 
 function botDeviceUidIsSet($config)
@@ -687,25 +687,25 @@ 
 	$timediff_inDays = (string)$timediff->format('%d');
 	$timediff_inMonth = (string)$timediff->format('%m');
 
-	if($timediff_inMonth!=0)
+	if($timediff_inMonth != 0)
 	{
 			$timediff = $timediff_inMonth . "m";
 	}
 	else
 	{
-		if($timediff_inDays!=0)
+		if($timediff_inDays != 0)
 		{
 			$timediff = $timediff_inDays . "d";
 		}
 		else
 		{
-			if($timediff_inHours!=0)
+			if($timediff_inHours != 0)
 			{
 				$timediff = $timediff_inHours . "h";
 			}
 			else
 			{
-				if($timediff_inMinutes!=0)
+				if($timediff_inMinutes != 0)
 				{
 					$timediff = $timediff_inMinutes . "m";
 				}
@@ -719,7 +719,7 @@ 
 
 
 	?>
-	<article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
+	<article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
 		<content>
 			<?php 
 			if(isset($post['image_url']))
@@ -737,24 +737,24 @@ 
 			<?php
 				if($isDetailedView)
 				{?>
-					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
+					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>" rel="nofollow">
 		  <?php }
 				else
 				{?>
-					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>" rel="nofollow">
+					<a href="index.php?vote=up&postID=<?php echo $post['post_id']; ?>" rel="nofollow">
 		  <?php } ?>
 						<i class="fa fa-angle-up fa-3x"></i>
 					</a>	
 						<br />
-					<?php echo $post["vote_count"];?><br />
+					<?php echo $post["vote_count"]; ?><br />
 			<?php
 				if($isDetailedView)
 				{?>
-					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>" rel="nofollow">
+					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>" rel="nofollow">
 		  <?php }
 				else
 				{?>
-					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>" rel="nofollow">
+					<a href="index.php?vote=down&postID=<?php echo $post['post_id']; ?>" rel="nofollow">
 		  <?php } ?>
 						<i class="fa fa-angle-down fa-3x"></i>
 					</a>
@@ -766,14 +766,14 @@ 
 					<td class="time">
 						<span class="tip" data-tooltip="Time">
 							<i class="fa fa-clock-o"></i>
-							<?php echo $timediff;?>
-							<span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
+							<?php echo $timediff; ?>
+							<span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
 						</span> 
 					</td>
 					<td class="comments">
 						<?php if(!$isDetailedView) {?>
 						<span data-tooltip="Comments">
-							<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>">
+							<a href="index.php?getPostDetails=true&view=<?php echo $view; ?>&postID=<?php echo $post["post_id"]; ?>">
 								<i class="fa fa-commenting-o"></i>
 								<?php if(array_key_exists("child_count", $post)) {
 											echo $post["child_count"];
@@ -802,7 +802,7 @@ 
 									{
 							  			?>
 							  			<span data-tooltip="Author">
-											<i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
+											<i class="fa fa-user-o"></i> #<?php echo $post["user_handle"]; ?> |
 										</span>
 										<?php
 									}
@@ -812,8 +812,8 @@ 
 
 						<span class="tip" data-tooltip="Distance">
 							<i class="fa fa-map-marker"></i>
-							<?php echo $post['distance'];?> km
-							<span class="tiptext"><?php echo $post['location']['name'];?></span>
+							<?php echo $post['distance']; ?> km
+							<span class="tiptext"><?php echo $post['location']['name']; ?></span>
 						</span>
 					</td>
 				</tr>

index.php

Spacing +12 added lines, -12 removed lines

@@ -36,8 +36,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
 		{
 			$deviceUid = createAccount();
-			setcookie('JodelDeviceId', $deviceUid, time()+60*60*24*365*10);
-			error_log('Created account with JodelDeviceId:' . $deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			error_log('Created account with JodelDeviceId:' . $deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -57,7 +57,7 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -244,13 +244,13 @@ 
 		else
 		{
 			$version = 'v2';
-			if($view=='comment')
+			if($view == 'comment')
 			{
 				$url = "/v2/posts/location/discussed/";
 			}
 			else
 			{
-				if($view=='upVote')
+				if($view == 'upVote')
 				{
 					$url = "/v2/posts/location/popular/";
 				}
@@ -277,13 +277,13 @@ 
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title><?php echo getTitle($posts[0], $view, $isDetailedView);?></title>
+		<title><?php echo getTitle($posts[0], $view, $isDetailedView); ?></title>
 		
 		<meta charset="utf-8">
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
 		
-		<meta name="description" content="<?php echo getMetaDescription($posts[0], $view, $isDetailedView);?>">
+		<meta name="description" content="<?php echo getMetaDescription($posts[0], $view, $isDetailedView); ?>">
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
 		
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous">
@@ -365,7 +365,7 @@ 
 
 					<content id="posts">
 						<?php
-							for($i = 0; $i<$loops; $i++)
+							for($i = 0; $i < $loops; $i++)
 							{
 								if(array_key_exists($i, $posts) && array_key_exists('post_id', $posts[$i]) && isset($posts[$i]['post_id']))
 								{
@@ -409,7 +409,7 @@ 
 								<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
 								<h2>Comment on Jodel</h2>
 								<form method="POST">				
-										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']);?>" />
+										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postID']); ?>" />
 										<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
 									<br />
 									<input type="submit" value="SEND" /> 
@@ -446,13 +446,13 @@ 
 				<div class="col-xs-12">
 					<div class="row">
 						<div class="col-xs-3">
-							<a href="index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+							<a href="index.php" <?php if($view == 'time') echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+							<a href="index.php?view=comment" <?php if($view == 'comment') echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
-							<a href="index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+							<a href="index.php?view=upVote" <?php if($view == 'upVote') echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
 						</div>
 						<div class="col-xs-3">
 							<nav>