mmainstreet / jodel-web

php/jodel-web.php

Indentation +3 added lines, -3 removed lines

@@ -294,11 +294,11 @@ 
 
 	if($result->num_rows == 0)
 	{
-	    return FALSE;
+		return FALSE;
 	}
 	else
 	{
-	    return TRUE;
+		return TRUE;
 	}
 }
 
@@ -392,7 +392,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)

Spacing +38 added lines, -38 removed lines

@@ -21,9 +21,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;
 	}
@@ -40,7 +40,7 @@ 
 	
 	$access_token;
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -57,7 +57,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();
@@ -72,7 +72,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -85,7 +85,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()) {
@@ -102,7 +102,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();
@@ -117,7 +117,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -132,7 +132,7 @@ 
 
 	$access_token;
 
-	if ($result->num_rows > 0)
+	if($result->num_rows > 0)
 	{
 			// output data of each row
 			while($row = $result->fetch_assoc()) {
@@ -164,7 +164,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false) {
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -175,11 +175,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())
@@ -200,11 +200,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())
@@ -225,11 +225,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())
@@ -248,11 +248,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())
@@ -313,7 +313,7 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId)
 					VALUES ('" . $device_uid . "','" . $postId . "') ");
 	
-	if($result === false){
+	if($result === false) {
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -342,11 +342,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;
@@ -392,7 +392,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)
@@ -423,25 +423,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";
 				}
@@ -455,7 +455,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"])) {
@@ -470,24 +470,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']);?>">
+					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>">
 		  <?php }
 				else
 				{?>
-					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>">
+					<a href="index.php?vote=up&postID=<?php echo $post['post_id']; ?>">
 		  <?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']);?>">
+					<a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id']; ?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']); ?>">
 		  <?php }
 				else
 				{?>
-					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>">
+					<a href="index.php?vote=down&postID=<?php echo $post['post_id']; ?>">
 		  <?php } ?>
 						<i class="fa fa-angle-down fa-3x"></i>
 					</a>
@@ -499,14 +499,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"];
@@ -535,7 +535,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
 									}
@@ -545,8 +545,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>

Braces +50 added lines, -25 removed lines

@@ -43,7 +43,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"];
@@ -55,7 +56,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -72,7 +74,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -88,7 +91,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"];
@@ -100,7 +104,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);//$accountData->getAccessToken());
 		$accountCreator->setDeviceUid($deviceUid);
@@ -117,7 +122,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -135,7 +141,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"];
@@ -147,7 +154,8 @@ 
 			echo '0 results';
 	}
 
-	if($expiration_date <= time()) {
+	if($expiration_date <= time())
+	{
 		$accountCreator = new CreateUser();
 		$accountCreator->setAccessToken($access_token);
 		$accountCreator->setDeviceUid($deviceUid);
@@ -164,7 +172,8 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === false)
+		{
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -313,7 +322,8 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId)
 					VALUES ('" . $device_uid . "','" . $postId . "') ");
 	
-	if($result === false){
+	if($result === false)
+	{
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -321,7 +331,8 @@ 
 	
 }
 
-function registerAccount(Location $location) {
+function registerAccount(Location $location)
+{
 	$accountCreator = new CreateUser();
 	$accountCreator->setLocation($location);
 	$data = $accountCreator->execute();
@@ -346,7 +357,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;
@@ -357,7 +369,7 @@ 
 }
 
 function getPosts($lastPostId, $accessToken, $url, $version = 'v2')
-{	
+{
 	$accountCreator = new GetPosts();
 	$accountCreator->setLastPostId($lastPostId);
 	$accountCreator->setAccessToken($accessToken);
@@ -408,7 +420,8 @@ 
 }
 
 function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE)
-{	//ToDO
+{
+//ToDO
 	//Replace # with link
 	//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -458,10 +471,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"])));
 			}
 			?>
@@ -469,11 +484,13 @@ 
 		<aside>
 			<?php
 				if($isDetailedView)
-				{?>
+				{
+?>
 					<a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>">
 		  <?php }
-				else
-				{?>
+else
+				{
+?>
 					<a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>">
 		  <?php } ?>
 						<i class="fa fa-angle-up fa-3x"></i>
@@ -482,11 +499,13 @@ 
 					<?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']);?>">
 		  <?php }
-				else
-				{?>
+else
+				{
+?>
 					<a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>">
 		  <?php } ?>
 						<i class="fa fa-angle-down fa-3x"></i>
@@ -504,13 +523,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>

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

@@ -72,7 +72,7 @@ 
 									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 +117,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === FALSE){
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -164,7 +164,7 @@ 
 									expiration_date='" . $expiration_date . "'
 								WHERE device_uid='" . $device_uid . "'");
 
-		if($result === false){
+		if($result === FALSE){
 				echo "Adding account failed: (" . $db->errno . ") " . $db->error;
 		}	
 	}
@@ -285,7 +285,7 @@ 
 						  FROM votes
 						  WHERE (postId = '" . $postId . "' AND device_uid = '" . $deviceUid . "')");
 	
-	if($result === false)
+	if($result === FALSE)
 	{
 		$error = db_error();
 		echo $error;
@@ -313,7 +313,7 @@ 
 	$result = $db->query("INSERT INTO votes (device_uid, postId)
 					VALUES ('" . $device_uid . "','" . $postId . "') ");
 	
-	if($result === false){
+	if($result === FALSE){
 			$error = db_error();
 			echo $error;
 			echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -346,7 +346,7 @@ 
 					"','" . $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;
@@ -392,7 +392,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)