mmainstreet / jodel-web

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=' . $_GET['city'] . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w';
 		$result = Requests::post($url);
@@ -53,11 +54,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);
@@ -69,7 +73,8 @@ 
 	
 	
 	//SendJodel
-	if(isset($_POST['message'])) {
+	if(isset($_POST['message']))
+	{
 		$ancestor;
 		if(isset($_POST['ancestor']))
 		{
@@ -113,7 +118,11 @@ 
 			<a href="index.php">
 				<h1>
 					Jodel WebClient
-					<?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 $_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($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,15 +318,29 @@ 
 					</content>
 							
 				</article>
-				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?>
+				<?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails']))
+{
+?>
 				<p id="loading">
 					<img src="images/loading.gif" alt="Loading…" />
 				</p>
 				<?php } ?>
 				<nav id="sortJodelBy">
-					<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?commentView=true" <?php if(isset($commentView)) echo 'class="active"';?>><i class="fa fa-commenting-o 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>
+					<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?commentView=true" <?php if(isset($commentView))
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-commenting-o 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>
 				</nav>
 			</div>
 			
@@ -308,7 +348,14 @@ 
 				<article>
 					<h3>Position</h3>
 					<form method="get">
-						<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; else echo $posts[0]["location"]["name"]; ?>" required>
+						<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+else {
+	echo $posts[0]["location"]["name"];
+}
+?>" required>
 
 						<input type="submit" value="Set Location" /> 
 					</form>
@@ -321,7 +368,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 $_GET['postID'];?>" />
@@ -329,7 +378,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> 
@@ -358,7 +410,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; ?>";

get-posts-ajax.php

Braces +32 added lines, -14 removed lines

@@ -17,9 +17,11 @@ 
 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;
 	}
@@ -28,12 +30,16 @@ 
 	
 	$access_token;
 	
-	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"];
 			}
-	} else {
+	}
+	else
+	{
 			echo "0 results";
 	}
 	
@@ -66,7 +72,8 @@ 
 		}
 	}
 
-	if(isset($_GET['lastPostId'])) {
+	if(isset($_GET['lastPostId']))
+	{
 	
 		$lastPostId = $_GET['lastPostId'];
 		
@@ -76,9 +83,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'];
 
 				
@@ -94,7 +103,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
@@ -127,10 +137,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 nl2br($posts[$i]["message"]);
 						}
 						?>
@@ -156,13 +168,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>

php/DatabaseConnect.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 
 }
 $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;
 }

php/Requests/GetKarma.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class GetKarma extends AbstractRequest {
+class GetKarma extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/SetLocation.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class SetLocation extends AbstractRequest {
+class SetLocation extends AbstractRequest
+{
 		 /**
      * @var Location
      */

php/Requests/CreateUser.php

Braces +5 added lines, -3 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-class CreateUser extends AbstractRequest {
+class CreateUser extends AbstractRequest
+{
     /**
      * @var Location
      */
@@ -25,7 +26,7 @@ 
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
     public function generateDeviceUid()
@@ -36,7 +37,8 @@ 
     {
         $str = '';
         $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
+        for ($i = 0; $i < $length; ++$i)
+        {
             $str .= $keyspace[random_int(0, $max)];
         }
         return $str;

php/Requests/GetPosts.php

Braces +2 added lines, -1 removed lines

@@ -31,7 +31,8 @@
     {
         $apiEndPoint = $this->getUrl();
         //echo $GLOBALS['lastPostId'];
-        if ($this->getLastPostId() != "") {
+        if ($this->getLastPostId() != "")
+        {
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
 		}
         return $apiEndPoint;

php/Requests/Upvote.php

Braces +2 added lines, -1 removed lines

@@ -1,7 +1,8 @@
 <?php
 
 
-class Upvote extends AbstractRequest {
+class Upvote extends AbstractRequest
+{
 		
     function getApiEndPoint()
     {

php/Requests/AbstractRequest.php

Braces +13 added lines, -7 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 abstract class AbstractRequest
-{	
+{
     CONST CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
     CONST APIURL = 'https://api.go-tellm.com/api';
     const SECRET = "VwJHzYUbPjGiXWauoVNaHoCWsaacTmnkGwNtHhjy";
@@ -19,7 +19,8 @@ 
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = "";
-		if(isset($this->payLoad["device_uid"])) {
+		if(isset($this->payLoad["device_uid"]))
+		{
 			$device_uid = $this->payLoad["device_uid"];
 		}
 				
@@ -28,7 +29,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -39,7 +41,8 @@ 
         */
         
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -50,7 +53,8 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -90,10 +94,12 @@ 
     public function getSignHeaders()
     {
 			$payload_accessToken;
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}