mmainstreet / jodel-web

get-posts-ajax.php

Braces +2 added lines, -1 removed lines

@@ -45,7 +45,8 @@
 
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'comment':
 				$view = 'comment';
 				break;

index.php

Braces +52 added lines, -17 removed lines

@@ -35,7 +35,8 @@ 
 	//Set View
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'comment':
 				$view = 'comment';
 				break;
@@ -55,7 +56,8 @@ 
 	}
 	
 	//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')
@@ -99,11 +101,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);
@@ -115,7 +120,8 @@ 
 	
 	
 	//SendJodel
-	if(isset($_POST['message'])) {
+	if(isset($_POST['message']))
+	{
 		$accountCreator = new SendJodel();
 
 		if(isset($_POST['ancestor']))
@@ -126,7 +132,8 @@ 
 		if(isset($_POST['color']))
 		{
 			$color = $_POST['color'];
-			switch ($color) {
+			switch ($color)
+			{
 				case '8ABDB0':
 					$color = '8ABDB0';
 					break;
@@ -228,7 +235,8 @@ 
 								$data = $accountCreator->execute();
 								
 								$posts[0] = $data;
-								if(isset($data['children'])) {
+								if(isset($data['children']))
+								{
 									foreach($data['children'] as $key => $child)
 									{
 										
@@ -250,7 +258,9 @@ 
 									}
 									$loops = $data['child_count'] + 1;
 								}
-								else $loops = 1;
+								else {
+									$loops = 1;
+								}
 								$isDetailedView = TRUE;
 							}
 							//Get Posts
@@ -291,7 +301,9 @@ 
 
 					</content>
 					
-					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -304,7 +316,11 @@ 
 							<div>
 								<h2>Position</h2>
 								<form method="get">
-									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 
 									<input type="submit" value="Set Location" /> 
 								</form>
@@ -320,7 +336,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']);?>" />
@@ -328,7 +346,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> 
@@ -360,13 +381,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>
@@ -398,7 +431,9 @@ 
 			}
 
 
-			<?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; ?>";

php/jodel-web.php

Braces +28 added lines, -13 removed lines

@@ -18,14 +18,16 @@ 
 
 $lastPostId = '';
 
-function isTokenFresh(Location $location) {
+function isTokenFresh(Location $location)
+{
 	$db = new DatabaseConnect();  
 	$result = $db->query("SELECT * FROM accounts WHERE id='1'");
 	
 	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"];
@@ -37,7 +39,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -54,7 +57,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -71,7 +75,8 @@ 
 	return $data["karma"];
 }
 
-function registerAccount(Location $location) {
+function registerAccount(Location $location)
+{
 	$accountCreator = new CreateUser();
 	$accountCreator->setLocation($location);
 	$data = $accountCreator->execute();
@@ -96,7 +101,8 @@ 
 					"','" . $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;
@@ -107,7 +113,7 @@ 
 }
 
 function getPosts($lastPostId, $accessToken, $url)
-{	
+{
 	$accountCreator = new GetPosts();
 	$accountCreator->setLastPostId($lastPostId);
 	$accountCreator->setAccessToken($accessToken);
@@ -128,7 +134,8 @@ 
 }
 
 function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
-{	//ToDO
+{
+//ToDO
 	//Replace # with link
 	//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -179,10 +186,12 @@ 
 	<article id ="postId-<?php echo $post["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $post["color"];?>;">
 		<content>
 			<?php 
-			if(isset($post["image_url"])) {
+			if(isset($post["image_url"]))
+			{
 				echo '<img src="' . $post["image_url"] . '">';
 			}
-			else {
+			else
+			{
 				echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post["message"])));
 			}
 			?>
@@ -208,13 +217,19 @@ 
 						</span> 
 					</td>
 					<td class="comments">
-						<?php if(!$isDetailedView) {?>
+						<?php if(!$isDetailedView)
+{
+?>
 						<span data-tooltip="Comments">
 							<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)) {
+								<?php if(array_key_exists("child_count", $post))
+{
 											echo $post["child_count"];
-										} else echo "0";
+										}
+										else {
+											echo "0";
+										}
 								?>
 								</a>
 						</span>