mmainstreet / jodel-web

index.php

Spacing +20 added lines, -20 removed lines

@@ -14,7 +14,7 @@ 
 	$accessToken;
 	$newPositionStatus;
 	
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while($row = $result->fetch_assoc())
@@ -114,7 +114,7 @@ 
 				<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 class="clear"></div>
@@ -131,11 +131,11 @@ 
 							if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) {
 								//Header Nav in Comment View
 								?>
-								<a id="comment-back" href="index.php#postId-<?php echo htmlspecialchars($_GET['postID']);?>">
+								<a id="comment-back" href="index.php#postId-<?php echo htmlspecialchars($_GET['postID']); ?>">
 									<i class="fa fa-angle-left fa-3x"></i>
 								</a>
 
-								<a id="comment-refresh" href="index.php?getPostDetails=<?php echo htmlspecialchars($_GET['getPostDetails']);?>&postID=<?php echo htmlspecialchars($_GET['postID']);?>">
+								<a id="comment-refresh" href="index.php?getPostDetails=<?php echo htmlspecialchars($_GET['getPostDetails']); ?>&postID=<?php echo htmlspecialchars($_GET['postID']); ?>">
 									<i class="fa fa-refresh fa-2x"></i>
 								</a>
 								<?php
@@ -182,7 +182,7 @@ 
 							}
 							
 
-							for($i = 0; $i<$loops; $i++) {
+							for($i = 0; $i < $loops; $i++) {
 							
 							if(isset($posts[$i])) {
 							$lastPostId = $posts[$i]['post_id'];
@@ -200,24 +200,24 @@ 
 							$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
 							{
-								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";
 										}
@@ -230,7 +230,7 @@ 
 							}
 						?>
 						
-						<article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;">
+						<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"])) {
@@ -242,12 +242,12 @@ 
 								?>
 							</content>
 							<aside>
-								<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>">
+								<a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>">
 									<i class="fa fa-angle-up fa-3x"></i>
 								</a>	
 									<br />
-								<?php echo $posts[$i]["vote_count"];?><br />
-								<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>">
+								<?php echo $posts[$i]["vote_count"]; ?><br />
+								<a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>">
 									<i class="fa fa-angle-down fa-3x"></i>
 								</a>
 							</aside>
@@ -258,13 +258,13 @@ 
 										<td class="time">
 											<span data-tooltip="Time">
 												<i class="fa fa-clock-o"></i>
-												<?php echo $timediff;?>
+												<?php echo $timediff; ?>
 											</span> 
 										</td>
 										<td class="comments">
 											<?php if($showCommentIcon) {?>
 											<span data-tooltip="Comments">
-												<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>">
+												<a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>">
 													<i class="fa fa-commenting-o"></i>
 													<?php if(array_key_exists("child_count", $posts[$i])) {
 																echo $posts[$i]["child_count"];
@@ -277,7 +277,7 @@ 
 										<td class="distance">
 											<span data-tooltip="Distance">
 												<i class="fa fa-map-marker"></i>
-												<?php echo $posts[$i]["distance"];?> km
+												<?php echo $posts[$i]["distance"]; ?> km
 											</span>
 										</td>
 									</tr>
@@ -319,7 +319,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" /> 
@@ -344,13 +344,13 @@ 
 				<div class="col-sm-12">
 					<div class="row">
 						<div class="col-sm-3">
-							<a href="index.php" <?php if(isset($timeView)) echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+							<a href="index.php" <?php if(isset($timeView)) echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
 						</div>
 						<div class="col-sm-3">
-							<a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+							<a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
 						</div>
 						<div class="col-sm-3">
-							<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+							<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
 						</div>
 						<div class="col-sm-3">
 							<nav>

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']))
 		{
@@ -114,7 +119,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 class="clear"></div>
@@ -128,7 +137,8 @@ 
 							$posts;
 
 							//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#postId-<?php echo htmlspecialchars($_GET['postID']);?>">
@@ -146,17 +156,22 @@ 
 								$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
-							else {
+							else
+							{
 								if(isset($_GET['commentView']))
 								{
 									$commentView = true;
@@ -182,9 +197,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'];
 
 							
@@ -200,7 +217,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
@@ -233,10 +251,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 nl2br(htmlspecialchars($posts[$i]["message"]));
 								}
 								?>
@@ -262,13 +282,19 @@ 
 											</span> 
 										</td>
 										<td class="comments">
-											<?php if($showCommentIcon) {?>
+											<?php if($showCommentIcon)
+{
+?>
 											<span data-tooltip="Comments">
 												<a href="index.php?getPostDetails=true&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>
@@ -292,7 +318,9 @@ 
 
 					</content>
 					
-					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -303,7 +331,14 @@ 
 					<article>
 						<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>
@@ -316,7 +351,9 @@ 
 					</article>
 
 					<article>
-						<?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']);?>" />
@@ -324,7 +361,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> 
@@ -344,13 +384,25 @@ 
 				<div class="col-sm-12">
 					<div class="row">
 						<div class="col-sm-3">
-							<a href="index.php" <?php if(isset($timeView)) echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+							<a href="index.php" <?php if(isset($timeView))
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-clock-o fa-3x"></i></a>
 						</div>
 						<div class="col-sm-3">
-							<a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+							<a href="index.php?commentView=true" <?php if(isset($commentView))
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-commenting-o fa-3x"></i></a>
 						</div>
 						<div class="col-sm-3">
-							<a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+							<a href="index.php?upVoteView=true" <?php if(isset($upVoteView))
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-angle-up fa-3x"></i></a>
 						</div>
 						<div class="col-sm-3">
 							<nav>
@@ -374,7 +426,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; ?>";

Upper-Lower-Casing +6 added lines, -6 removed lines

@@ -34,15 +34,15 @@ 
 	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')
+		if(json_decode($result->body, TRUE)['status'] == 'ZERO_RESULTS' || json_decode($result->body, TRUE)['status'] == 'INVALID_REQUEST')
 		{
 			$newPositionStatus = "0 results";
 		}
 		else
 		{
 			$location = new Location();
-			$location->setLat(json_decode($result->body, true)['results']['0']['geometry']['location']['lat']);
-			$location->setLng(json_decode($result->body, true)['results']['0']['geometry']['location']['lng']);
+			$location->setLat(json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lat']);
+			$location->setLng(json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lng']);
 			$location->setCityName(htmlspecialchars($_GET['city']));
 			$accountCreator = new UpdateLocation();
 			$accountCreator->setLocation($location);
@@ -159,19 +159,19 @@ 
 							else {
 								if(isset($_GET['commentView']))
 								{
-									$commentView = true;
+									$commentView = TRUE;
 									$url = "/v2/posts/location/discussed/";
 								}
 								else
 								{
 									if(isset($_GET['upVoteView']))
 									{
-										$upVoteView = true;
+										$upVoteView = TRUE;
 										$url = "/v2/posts/location/popular/";
 									}
 									else
 									{
-										$timeView = true;
+										$timeView = TRUE;
 										$url = "/v2/posts";
 									}
 								}

php/Requests/SetLocation.php

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class UpdateLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation($location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation($location)
+	{
+		$this->location = $location;
+	}
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/location';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/users/location';
+	}
+	function getPayload()
+	{
+		return array(
 					"location" => $this->getLocation()->toArray(),
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }