mmainstreet / jodel-web

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));
   }
 

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

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';
+	}
 }
 

Braces +2 added lines, -1 removed lines

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

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';
+	}
 }

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

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';
+	}
 }
 

Braces +2 added lines, -1 removed lines

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

php/Requests/GetPostDetails.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class GetPostDetails extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'];
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'];
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }
 

Braces +2 added lines, -1 removed lines

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

php/Requests/Downvote.php

Indentation +13 added lines, -13 removed lines

@@ -3,18 +3,18 @@
 
 class Downvote extends AbstractRequest {
 		
-    function getApiEndPoint()
-    {
-        return '/v2/posts/' . $_GET['postID'] . '/downvote';
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'PUT';
-    }
+	function getApiEndPoint()
+	{
+		return '/v2/posts/' . $_GET['postID'] . '/downvote';
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'PUT';
+	}
 }
 

Braces +2 added lines, -1 removed lines

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

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; ?>";

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(): 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';
+	}
 }
 

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;

Indentation +46 added lines, -46 removed lines

@@ -1,53 +1,53 @@ 
 <?php
 
 class CreateUser extends AbstractRequest {
-    /**
-     * @var Location
-     */
-    private $location;
-    private $deviceUid;
-    /**
-     * @return Location
-     */
-    private function getLocation()
-    {
-        return $this->location;
-    }
-    /**
-     * @param Location $location
-     */
-    public function setLocation(Location $location)
-    {
-        $this->location = $location;
-    }
-    private function getDeviceUid()
-    {
+	/**
+	 * @var Location
+	 */
+	private $location;
+	private $deviceUid;
+	/**
+	 * @return Location
+	 */
+	private function getLocation()
+	{
+		return $this->location;
+	}
+	/**
+	 * @param Location $location
+	 */
+	public function setLocation(Location $location)
+	{
+		$this->location = $location;
+	}
+	private function getDeviceUid()
+	{
 		return $this->deviceUid;
 	}
 	public function setDeviceUid($deviceUid)
-    {
+	{
 			$this->deviceUid = $deviceUid;
 	}
-    private function generateDeviceUid()
-    {
-        return $this->random_str(64, 'abcdef0123456789');
-    }
+	private function generateDeviceUid()
+	{
+		return $this->random_str(64, 'abcdef0123456789');
+	}
     
-    private 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;
-    }
-    public function getApiEndPoint()
-    {
-        return '/v2/users';
-    }
-    public function getPayload()
-    {
+	private 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;
+	}
+	public function getApiEndPoint()
+	{
+		return '/v2/users';
+	}
+	public function getPayload()
+	{
 			if(!isset($this->deviceUid))
 			{
 				$this->setDeviceUid($this->generateDeviceUid());
@@ -58,9 +58,9 @@ 
 					"client_id" => self::CLIENTID,
 					"device_uid" => $this->getDeviceUid(),
 			);
-    }
-    public function getMethod()
-    {
-        return 'POST';
-    }
+	}
+	public function getMethod()
+	{
+		return 'POST';
+	}
 }