mmainstreet / jodel-web

index.php

Braces +37 added lines, -27 removed lines

@@ -21,8 +21,7 @@ 
 		{
 			$accessToken = $row["access_token"];
 		}
-	}
-	else
+	} else
 	{
 		echo "Error: 0 results";
 	}
@@ -38,8 +37,7 @@ 
 		if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS')
 		{
 			$newPostionStatus = "0 results";
-		}
-		else
+		} else
 		{
 			$location = new Location();
 			$location->setLat(json_decode($result->body, true)['results']['0']['geometry']['location']['lat']);
@@ -56,8 +54,7 @@ 
 	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);
@@ -113,7 +110,10 @@ 
 			<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>
@@ -151,8 +151,9 @@ 
 										array_push($posts, $child);
 									}
 									$loops = $data['child_count'] + 1;
+								} else {
+									$loops = 1;
 								}
-								else $loops = 1;
 								$showCommentIcon = FALSE;
 							}
 							//Get Posts
@@ -161,15 +162,13 @@ 
 								{
 									$commentView = true;
 									$url = "/v2/posts/location/discussed/";
-								}
-								else
+								} else
 								{
 									if(isset($_GET['upVoteView']))
 									{
 										$upVoteView = true;
 										$url = "/v2/posts/location/popular/";
-									}
-									else
+									} else
 									{
 										$timeView = true;
 										$url = "/v2/posts";
@@ -202,26 +201,22 @@ 
 							$timediff_inMonth = (string)$timediff->format('%m');
 							if($timediff_inMonth!=0) {
 									$timediff = $timediff_inMonth . "m";
-							}
-							else
+							} else
 							{
 								if($timediff_inDays!=0)
 								{
 									$timediff = $timediff_inDays . "d";
-								}
-								else
+								} else
 								{
 									if($timediff_inHours!=0)
 									{
 										$timediff = $timediff_inHours . "h";
-									}
-									else
+									} else
 									{
 										if($timediff_inMinutes!=0)
 										{
 											$timediff = $timediff_inMinutes . "m";
-										}
-										else
+										} else
 										{
 											$timediff = $timediff_inSeconds . "s";
 										}
@@ -235,8 +230,7 @@ 
 								<?php 
 								if(isset($posts[$i]["image_url"])) {
 									echo '<img src="' . $posts[$i]["image_url"] . '">';
-								}
-								else {
+								} else {
 									echo nl2br($posts[$i]["message"]);
 								}
 								?>
@@ -268,7 +262,9 @@ 
 													<i class="fa fa-commenting-o"></i>
 													<?php if(array_key_exists("child_count", $posts[$i])) {
 																echo $posts[$i]["child_count"];
-															} else echo "0";
+															} else {
+																echo "0";
+															}
 													?>
 													</a>
 											</span>
@@ -298,9 +294,18 @@ 
 				</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 +313,12 @@ 
 				<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>

get-posts-ajax.php

Braces +10 added lines, -15 removed lines

@@ -51,15 +51,13 @@ 
 	{
 		$commentView = true;
 		$url = "/posts/location/discussed/";
-	}
-	else
+	} else
 	{
 		if(isset($_GET['upVoteView']))
 		{
 			$upVoteView = true;
 			$url = "/posts/location/popular/";
-		}
-		else
+		} else
 		{
 			$timeView = true;
 			$url = "/v2/posts";
@@ -96,26 +94,22 @@ 
 							$timediff_inMonth = (string)$timediff->format('%m');
 							if($timediff_inMonth!=0) {
 									$timediff = $timediff_inMonth . "m";
-							}
-							else
+							} else
 							{
 								if($timediff_inDays!=0)
 								{
 									$timediff = $timediff_inDays . "d";
-								}
-								else
+								} else
 								{
 									if($timediff_inHours!=0)
 									{
 										$timediff = $timediff_inHours . "h";
-									}
-									else
+									} else
 									{
 										if($timediff_inMinutes!=0)
 										{
 											$timediff = $timediff_inMinutes . "m";
-										}
-										else
+										} else
 										{
 											$timediff = $timediff_inSeconds . "s";
 										}
@@ -129,8 +123,7 @@ 
 						<?php 
 						if(isset($posts[$i]["image_url"])) {
 							echo '<img src="' . $posts[$i]["image_url"] . '">';
-						}
-						else {
+						} else {
 							echo nl2br($posts[$i]["message"]);
 						}
 						?>
@@ -162,7 +155,9 @@ 
 											<i class="fa fa-commenting-o"></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

Indentation +1 added lines, -1 removed lines

@@ -40,6 +40,6 @@
 			 ) DEFAULT CHARSET=utf8";
   if(!$db->query($query))
   {
-    throw new Exception($db->error($mysqli));
+	throw new Exception($db->error($mysqli));
   }
 

php/AccountData.php

Indentation +90 added lines, -90 removed lines

@@ -2,94 +2,94 @@
 
 class AccountData
 {
-    /**
-     * @var string
-     */
-    public $accessToken;
-    /**
-     * @var string
-     */
-    public $expirationDate;
-    /**
-     * @var string
-     */
-    public $refreshToken;
-    /**
-     * @var string
-     */
-    public $distinctId;
-    /**
-     * @var string
-     */
-    public $deviceUid;
-    /**
-     * @return string
-     */
-    public function getAccessToken(): string
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken(string $accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
-    /**
-     * @return string
-     */
-    public function getExpirationDate(): string
-    {
-        return $this->expirationDate;
-    }
-    /**
-     * @param string $expirationDate
-     */
-    public function setExpirationDate(string $expirationDate)
-    {
-        $this->expirationDate = $expirationDate;
-    }
-    /**
-     * @return string
-     */
-    public function getRefreshToken(): string
-    {
-        return $this->refreshToken;
-    }
-    /**
-     * @param string $refreshToken
-     */
-    public function setRefreshToken(string $refreshToken)
-    {
-        $this->refreshToken = $refreshToken;
-    }
-    /**
-     * @return string
-     */
-    public function getDistinctId(): string
-    {
-        return $this->distinctId;
-    }
-    /**
-     * @param string $distinctId
-     */
-    public function setDistinctId(string $distinctId)
-    {
-        $this->distinctId = $distinctId;
-    }
-    /**
-     * @return string
-     */
-    public function getDeviceUid(): string
-    {
-        return $this->deviceUid;
-    }
-    /**
-     * @param string $deviceUid
-     */
-    public function setDeviceUid(string $deviceUid)
-    {
-        $this->deviceUid = $deviceUid;
-    }
+	/**
+	 * @var string
+	 */
+	public $accessToken;
+	/**
+	 * @var string
+	 */
+	public $expirationDate;
+	/**
+	 * @var string
+	 */
+	public $refreshToken;
+	/**
+	 * @var string
+	 */
+	public $distinctId;
+	/**
+	 * @var string
+	 */
+	public $deviceUid;
+	/**
+	 * @return string
+	 */
+	public function getAccessToken(): string
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken(string $accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
+	/**
+	 * @return string
+	 */
+	public function getExpirationDate(): string
+	{
+		return $this->expirationDate;
+	}
+	/**
+	 * @param string $expirationDate
+	 */
+	public function setExpirationDate(string $expirationDate)
+	{
+		$this->expirationDate = $expirationDate;
+	}
+	/**
+	 * @return string
+	 */
+	public function getRefreshToken(): string
+	{
+		return $this->refreshToken;
+	}
+	/**
+	 * @param string $refreshToken
+	 */
+	public function setRefreshToken(string $refreshToken)
+	{
+		$this->refreshToken = $refreshToken;
+	}
+	/**
+	 * @return string
+	 */
+	public function getDistinctId(): string
+	{
+		return $this->distinctId;
+	}
+	/**
+	 * @param string $distinctId
+	 */
+	public function setDistinctId(string $distinctId)
+	{
+		$this->distinctId = $distinctId;
+	}
+	/**
+	 * @return string
+	 */
+	public function getDeviceUid(): string
+	{
+		return $this->deviceUid;
+	}
+	/**
+	 * @param string $deviceUid
+	 */
+	public function setDeviceUid(string $deviceUid)
+	{
+		$this->deviceUid = $deviceUid;
+	}
 }

php/Requests/GetKarma.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetKarma extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/users/karma';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/users/karma';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

php/Requests/SetLocation.php

Indentation +30 added lines, -30 removed lines

@@ -3,37 +3,37 @@
 
 class SetLocation extends AbstractRequest {
 		 /**
-     * @var Location
-     */
-    public $location;
-    /**
-     * @return Location
-     */
-    public function getLocation(): Location
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
+		  * @var Location
+		  */
+	public $location;
+	/**
+	 * @return Location
+	 */
+	public function getLocation(): Location
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $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';
+	}
 }
 

php/Requests/CreateUser.php

Indentation +47 added lines, -47 removed lines

@@ -1,66 +1,66 @@
 <?php
 
 class CreateUser extends AbstractRequest {
-    /**
-     * @var Location
-     */
-    public $location;
-    public $deviceUid;
-    /**
-     * @return Location
-     */
-    public function getLocation(): Location
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
-    public function getDeviceUid()
-    {
+	/**
+	 * @var Location
+	 */
+	public $location;
+	public $deviceUid;
+	/**
+	 * @return Location
+	 */
+	public function getLocation(): Location
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
+	public function getDeviceUid()
+	{
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
-    public function generateDeviceUid()
-    {
-        return $this->random_str(64, 'abcdef0123456789');
-    }
-    function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
-    {
-        $str = '';
-        $max = mb_strlen($keyspace, '8bit') - 1;
-        for ($i = 0; $i < $length; ++$i) {
-            $str .= $keyspace[random_int(0, $max)];
-        }
-        return $str;
-    }
-    function getApiEndPoint()
-    {
-        return '/v2/users';
-    }
-    function getPayload()
-    {
+	public function generateDeviceUid()
+	{
+		return $this->random_str(64, 'abcdef0123456789');
+	}
+	function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+	{
+		$str = '';
+		$max = mb_strlen($keyspace, '8bit') - 1;
+		for ($i = 0; $i < $length; ++$i) {
+			$str .= $keyspace[random_int(0, $max)];
+		}
+		return $str;
+	}
+	function getApiEndPoint()
+	{
+		return '/v2/users';
+	}
+	function getPayload()
+	{
 			if(!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
 			}
 			echo $this->getDeviceUid();
-            echo "<br>";
+			echo "<br>";
 			return array(
 					"location" => $this->getLocation()->toArray(),
 					"client_id" => self::CLIENTID,
 					"device_uid" => $this->getDeviceUid(),
 			);
-    }
-    function getMethod()
-    {
-        return 'POST';
-    }
+	}
+	function getMethod()
+	{
+		return 'POST';
+	}
 }

php/Requests/GetPosts.php

Indentation +27 added lines, -27 removed lines

@@ -5,20 +5,20 @@ 
 {
 	public $lastPostId;
 
-    public $url;
+	public $url;
         
-    function setUrl ($url)
-    {
-            $this->url = $url;
-    }
+	function setUrl ($url)
+	{
+			$this->url = $url;
+	}
     
-    function getUrl ()
-    {
-        return $this->url;
-    }
+	function getUrl ()
+	{
+		return $this->url;
+	}
 		
-    function setLastPostId ($lastPostId)
-    {
+	function setLastPostId ($lastPostId)
+	{
 			$this->lastPostId = $lastPostId;
 	}
 	
@@ -27,22 +27,22 @@ 
 		return $this->lastPostId;
 	}
     
-    function getApiEndPoint()
-    {
-        $apiEndPoint = $this->getUrl();
-        //echo $GLOBALS['lastPostId'];
-        if ($this->getLastPostId() != "") {
+	function getApiEndPoint()
+	{
+		$apiEndPoint = $this->getUrl();
+		//echo $GLOBALS['lastPostId'];
+		if ($this->getLastPostId() != "") {
 			$apiEndPoint = $this->getUrl() . '/location/?after=' . $this->getLastPostId();
 		}
-        return $apiEndPoint;
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+		return $apiEndPoint;
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }

php/Requests/Upvote.php

Indentation +13 added lines, -13 removed lines

@@ -3,19 +3,19 @@
 
 class Upvote extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'] . '/upvote';
-    }
-    function getPayload()
-    {
-        return array(
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'] . '/upvote';
+	}
+	function getPayload()
+	{
+		return array(
 					"reason_code" => -1,
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }