mmainstreet / jodel-web

admin.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 	$i = 0;
 	$result = $db->query("SELECT access_token FROM accounts");
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 		// output data of each row
 		while(($row = $result->fetch_assoc()) && $i < $_POST['quantity'])
@@ -170,7 +170,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" /> 
@@ -207,13 +207,13 @@ 
 				<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>

Braces +34 added lines, -9 removed lines

@@ -30,10 +30,12 @@ 
 			var_dump($accessToken);
 			isTokenFreshByAccessToken($location, $accessToken);
 
-			if($_POST['vote'] == "up") {
+			if($_POST['vote'] == "up")
+			{
 				$accountCreator = new Upvote();
 			}
-			else if($_POST['vote'] == "down") {
+			else if($_POST['vote'] == "down")
+			{
 				$accountCreator = new Downvote();
 			}
 
@@ -151,7 +153,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>
@@ -167,7 +173,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']);?>" />
@@ -175,7 +183,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> 
@@ -207,13 +218,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>
@@ -256,7 +279,9 @@ 
 				    $('html,body').animate({scrollTop: aTag.offset().top-90},'slow');
 				}
 
-				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+?>
 
 				
 

php/jodel-web.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
 	$db = new DatabaseConnect();  
 	$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()) {
@@ -40,7 +40,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();
@@ -55,7 +55,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -68,7 +68,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()) {
@@ -85,7 +85,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();
@@ -100,7 +100,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -138,11 +138,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;
@@ -197,25 +197,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";
 				}
@@ -229,7 +229,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"])) {
@@ -241,12 +241,12 @@ 
 			?>
 		</content>
 		<aside>
-			<a href="index.php?vote=up&postID=<?php echo $post["post_id"];?>">
+			<a href="index.php?vote=up&postID=<?php echo $post["post_id"]; ?>">
 				<i class="fa fa-angle-up fa-3x"></i>
 			</a>	
 				<br />
-			<?php echo $post["vote_count"];?><br />
-			<a href="index.php?vote=down&postID=<?php echo $post["post_id"];?>">
+			<?php echo $post["vote_count"]; ?><br />
+			<a href="index.php?vote=down&postID=<?php echo $post["post_id"]; ?>">
 				<i class="fa fa-angle-down fa-3x"></i>
 			</a>
 		</aside>
@@ -257,13 +257,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(!$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"];
@@ -292,7 +292,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
 									}
@@ -302,7 +302,7 @@ 
 
 						<span data-tooltip="Distance">
 							<i class="fa fa-map-marker"></i>
-							<?php echo $post["distance"];?> km
+							<?php echo $post["distance"]; ?> km
 						</span>
 					</td>
 				</tr>

Braces +32 added lines, -15 removed lines

@@ -26,7 +26,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"];
@@ -38,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);
@@ -55,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 +74,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"];
@@ -83,7 +87,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -100,7 +105,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -117,7 +123,8 @@ 
 	return $data["karma"];
 }
 
-function registerAccount(Location $location) {
+function registerAccount(Location $location)
+{
 	$accountCreator = new CreateUser();
 	$accountCreator->setLocation($location);
 	$data = $accountCreator->execute();
@@ -142,7 +149,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;
@@ -153,7 +161,7 @@ 
 }
 
 function getPosts($lastPostId, $accessToken, $url, $version = 'v2')
-{	
+{
 	$accountCreator = new GetPosts();
 	$accountCreator->setLastPostId($lastPostId);
 	$accountCreator->setAccessToken($accessToken);
@@ -181,7 +189,8 @@ 
 }
 
 function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
-{	//ToDO
+{
+//ToDO
 	//Replace # with link
 	//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -232,10 +241,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"])));
 			}
 			?>
@@ -261,13 +272,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>