mmainstreet / jodel-web

php/jodel-web.php

Braces +15 added lines, -8 removed lines

@@ -18,7 +18,8 @@ 
 
 $lastPostId = "";
 
-function isTokenFresh(Location $location) {
+function isTokenFresh(Location $location)
+{
 	$db = new DatabaseConnect();  
 	$result = $db->query("SELECT * FROM accounts WHERE id='1'");
 	
@@ -29,7 +30,8 @@ 
 	if ($result->num_rows > 0)
 	{
 			// output data of each row
-			while($row = $result->fetch_assoc()) {
+			while($row = $result->fetch_assoc())
+			{
 					//$access_token = $row["access_token"];
 					$expiration_date = $row["expiration_date"];
 					$deviceUid = $row["device_uid"];
@@ -41,7 +43,8 @@ 
 			echo "0 results";
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -63,7 +66,8 @@ 
 								WHERE device_uid='" . $device_uid . "'");
 
 		$success = TRUE;
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 				$success = FALSE;
 		}	
@@ -85,7 +89,8 @@ 
 	return $data["karma"];
 }
 
-function registerAccount(Location $location) {
+function registerAccount(Location $location)
+{
 	$accountCreator = new CreateUser();
 	$accountCreator->setLocation($location);
 	$data = $accountCreator->execute();
@@ -106,7 +111,8 @@ 
 					"','" . $device_uid . "') ");
 
 	$success = TRUE;
-	if($result === false){
+	if($result === false)
+	{
 			$error = db_error();
 			echo $error;
 			echo "Adding account failed: (" . $result->errno . ") " . $result->error;
@@ -117,7 +123,7 @@ 
 }
 
 function getPosts($lastPostId, $accessToken, $url)
-{	
+{
 	$accountCreator = new GetPosts();
 	$accountCreator->setLastPostId($lastPostId);
 	$accountCreator->setAccessToken($accessToken);
@@ -127,7 +133,8 @@ 
 	return $data;
 }
 
-function createAccount() {
+function createAccount()
+{
 	$location = new Location();
 	$location->setLat(50.690399);
 	$location->setLng(10.918175);

get-posts-ajax.php

Braces +31 added lines, -14 removed lines

@@ -17,18 +17,22 @@ 
 require_once 'php/Requests/libary/Requests.php';
 Requests::register_autoloader();
 
-function getPosts($lastPostId, $url) {
+function getPosts($lastPostId, $url)
+{
 	$db = new DatabaseConnect();
-	if ($db->connect_errno) {
+	if ($db->connect_errno)
+	{
 		echo 'Sorry, die Verbindung zu unserem superfetten endgeilen 
 					Server ist hops gegangen. Wegen '. $db -> connect_error;
 	}
 	
 	$result = $db->query("SELECT * FROM accounts WHERE id='1'");
 	
-	if ($result->num_rows > 0) {
+	if ($result->num_rows > 0)
+	{
 		// output data of each row
-		while($row = $result->fetch_assoc()) {
+		while($row = $result->fetch_assoc())
+		{
 			$access_token = $row["access_token"];
 		}
 	}
@@ -49,7 +53,8 @@ 
 
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -84,7 +89,8 @@ 
 		}
 	}
 
-	if(isset($_GET['lastPostId'])) {
+	if(isset($_GET['lastPostId']))
+	{
 	
 		$lastPostId = htmlspecialchars($_GET['lastPostId']);
 		
@@ -94,9 +100,11 @@ 
 		?>
 		<div class="nextPosts">
 		<?php
-		for($i = 0; $i<$loops; $i++) {
+		for($i = 0; $i<$loops; $i++)
+		{
 		
-			if(isset($posts[$i])) {
+			if(isset($posts[$i]))
+			{
 				$lastPostId = $posts[$i]['post_id'];
 
 				
@@ -112,7 +120,8 @@ 
 							$timediff_inHours = (string)$timediff->format('%h');
 							$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
@@ -145,10 +154,12 @@ 
 				<article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
 					<content>
 						<?php 
-						if(isset($posts[$i]["image_url"])) {
+						if(isset($posts[$i]["image_url"]))
+						{
 							echo '<img src="' . $posts[$i]["image_url"] . '">';
 						}
-						else {
+						else
+						{
 							echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($posts[$i]["message"])));
 						}
 						?>
@@ -174,13 +185,19 @@ 
 									</span> 
 								</td>
 								<td class="comments">
-									<?php if($showCommentIcon) {?>
+									<?php if($showCommentIcon)
+{
+?>
 									<span data-tooltip="Comments">
 										<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $posts[$i]["post_id"];?>">
 											<i class="fa fa-commenting-o"></i>
-											<?php if(array_key_exists("child_count", $posts[$i])) {
+											<?php if(array_key_exists("child_count", $posts[$i]))
+{
 														echo $posts[$i]["child_count"];
-													} else echo "0";
+													}
+													else {
+														echo "0";
+													}
 											?>
 											</a>
 									</span>

index.php

Braces +81 added lines, -27 removed lines

@@ -31,7 +31,8 @@ 
 	//createAccount();
 	
 	//Set Location
-	if(isset($_GET['city'])) {
+	if(isset($_GET['city']))
+	{
 		$url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
 		$result = Requests::post($url);
 		if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST')
@@ -52,11 +53,14 @@ 
 	}
 	
 	//Vote
-	if(isset($_GET['vote']) && isset($_GET['postID'])) {
-		if($_GET['vote'] == "up") {
+	if(isset($_GET['vote']) && isset($_GET['postID']))
+	{
+		if($_GET['vote'] == "up")
+		{
 			$accountCreator = new Upvote();
 		}
-		else if($_GET['vote'] == "down") {
+		else if($_GET['vote'] == "down")
+		{
 			$accountCreator = new Downvote();
 		}
 		$accountCreator->setAccessToken($accessToken);
@@ -68,7 +72,8 @@ 
 	
 	
 	//SendJodel
-	if(isset($_POST['message'])) {
+	if(isset($_POST['message']))
+	{
 		$ancestor;
 		if(isset($_POST['ancestor']))
 		{
@@ -113,7 +118,11 @@ 
 		  			<a href="index.php">
 						<h1>
 							JodelBlue
-							<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) echo '<i class="fa fa-refresh fa-1x"></i>';?>
+							<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+	echo '<i class="fa fa-refresh fa-1x"></i>';
+}
+?>
 						</h1>					
 					</a>
 				</div>
@@ -131,7 +140,8 @@ 
 							//Set View
 							if(isset($_GET['view']))
 							{
-								switch ($_GET['view']) {
+								switch ($_GET['view'])
+								{
 									case 'comment':
 										$view = 'comment';
 										break;
@@ -151,7 +161,8 @@ 
 							}
 
 							//Get Post Details
-							if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) {
+							if(isset($_GET['postID']) && isset($_GET['getPostDetails']))
+							{
 								//Header Nav in Comment View
 								?>
 								<a id="comment-back" href="index.php?view=<?php echo $view;?>#postId-<?php echo htmlspecialchars($_GET['postID']);?>">
@@ -169,13 +180,17 @@ 
 								$data = $accountCreator->execute();
 								
 								$posts[0] = $data;
-								if(isset($data['children'])) {
-									foreach($data['children'] as $child) {
+								if(isset($data['children']))
+								{
+									foreach($data['children'] as $child)
+									{
 										array_push($posts, $child);
 									}
 									$loops = $data['child_count'] + 1;
 								}
-								else $loops = 1;
+								else {
+									$loops = 1;
+								}
 								$showCommentIcon = FALSE;
 							}
 							//Get Posts
@@ -203,9 +218,11 @@ 
 							}
 							
 
-							for($i = 0; $i<$loops; $i++) {
+							for($i = 0; $i<$loops; $i++)
+							{
 							
-							if(isset($posts[$i])) {
+							if(isset($posts[$i]))
+							{
 							$lastPostId = $posts[$i]['post_id'];
 
 							
@@ -221,7 +238,8 @@ 
 							$timediff_inHours = (string)$timediff->format('%h');
 							$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
@@ -254,10 +272,12 @@ 
 						<article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
 							<content>
 								<?php 
-								if(isset($posts[$i]["image_url"])) {
+								if(isset($posts[$i]["image_url"]))
+								{
 									echo '<img src="' . $posts[$i]["image_url"] . '">';
 								}
-								else {
+								else
+								{
 									echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($posts[$i]["message"])));
 								}
 								?>
@@ -283,13 +303,19 @@ 
 											</span> 
 										</td>
 										<td class="comments">
-											<?php if($showCommentIcon) {?>
+											<?php if($showCommentIcon)
+{
+?>
 											<span data-tooltip="Comments">
 												<a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $posts[$i]["post_id"];?>">
 													<i class="fa fa-commenting-o"></i>
-													<?php if(array_key_exists("child_count", $posts[$i])) {
+													<?php if(array_key_exists("child_count", $posts[$i]))
+{
 																echo $posts[$i]["child_count"];
-															} else echo "0";
+															}
+															else {
+																echo "0";
+															}
 													?>
 													</a>
 											</span>
@@ -313,7 +339,9 @@ 
 
 					</content>
 					
-					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -326,7 +354,14 @@ 
 							<div>
 								<h2>Position</h2>
 								<form method="get">
-									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; else echo htmlspecialchars($posts[0]["location"]["name"]); ?>" required>
+									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+else {
+	echo htmlspecialchars($posts[0]["location"]["name"]);
+}
+?>" required>
 
 									<input type="submit" value="Set Location" /> 
 								</form>
@@ -342,7 +377,9 @@ 
 
 						<article>
 							<div>
-								<?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?>
+								<?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']);?>" />
@@ -350,7 +387,10 @@ 
 									<br />
 									<input type="submit" value="SEND" /> 
 								</form>
-									<?php } else { ?>
+									<?php }
+else
+{
+?>
 								<h2>New Jodel</h2>
 								<form method="POST">
 									<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> 
@@ -373,13 +413,25 @@ 
 				<div class="col-sm-12">
 					<div class="row">
 						<div class="col-sm-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-sm-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-sm-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-sm-3">
 							<nav>
@@ -403,7 +455,9 @@ 
 			    $(this).addClass('selected');
 			});
 
-			<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+			<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+?>
 			$(document).ready(function() {
 				var win = $(window);
 				var lastPostId = "<?php echo $lastPostId; ?>";