mmainstreet / jodel-web

php/Requests/GetChannel.php

Indentation +36 added lines, -36 removed lines

@@ -2,41 +2,41 @@
 
 class GetChannel extends AbstractRequest
 {
-    /**
-     * @var Location
-     */
-    public $location;
-    public $channel;
-    public $hasPayload = FALSE;
-    public $lastPostId = '';
-    public $view = 'combo';
+	/**
+	 * @var Location
+	 */
+	public $location;
+	public $channel;
+	public $hasPayload = FALSE;
+	public $lastPostId = '';
+	public $view = 'combo';
 		
-    function getApiEndPoint()
-    {
-        if($this->lastPostId == '')
-        {
-            $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
-        }
-        else
-        {
-            if($this->view == 'combo')
-            {
-                $apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
-            }
-            else
-            {
-                $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
-            }
-        }
-        return $apiEndPoint;
-    }
-    function getPayload()
-    {
-        return array(
-        );
-    }
-    function getMethod()
-    {
-        return 'GET';
-    }
+	function getApiEndPoint()
+	{
+		if($this->lastPostId == '')
+		{
+			$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel;
+		}
+		else
+		{
+			if($this->view == 'combo')
+			{
+				$apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
+			}
+			else
+			{
+				$apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId;
+			}
+		}
+		return $apiEndPoint;
+	}
+	function getPayload()
+	{
+		return array(
+		);
+	}
+	function getMethod()
+	{
+		return 'GET';
+	}
 }

php/View.php

Indentation +188 added lines, -188 removed lines

@@ -2,105 +2,105 @@ 
 
 class View
 {
-    public $country;
-    public $city;
-    public $hashtag;
+	public $country;
+	public $city;
+	public $hashtag;
 	public $view;
-    public $postId;
-    public $isDetailedView;
+	public $postId;
+	public $isDetailedView;
 
 	public $lastPostId = '';
 
-    function __construct($country, $city, $hashtag = '#all', $view = 'time', $postId = '')
-    {
-        $this->country = $country;
-        $this->city = $city;
-        $this->hashtag = $hashtag;
-        $this->view = $view;
-        $this->postId = $postId;
+	function __construct($country, $city, $hashtag = '#all', $view = 'time', $postId = '')
+	{
+		$this->country = $country;
+		$this->city = $city;
+		$this->hashtag = $hashtag;
+		$this->view = $view;
+		$this->postId = $postId;
 
-        if($postId == '')
-        {
-            $this->isDetailedView = FALSE;
-        }
-        else
-        {
-            $this->isDetailedView = TRUE;
-        }
-    }
+		if($postId == '')
+		{
+			$this->isDetailedView = FALSE;
+		}
+		else
+		{
+			$this->isDetailedView = TRUE;
+		}
+	}
 	/**
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
-        //Replace # with link
-        //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
+	{   //ToDO
+		//Replace # with link
+		//preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
-        //Time to time difference
-        $now = new DateTime();
-        $d = new DateTime($post['created_at']);
-        $timediff = $now->diff($d);
+		//Time to time difference
+		$now = new DateTime();
+		$d = new DateTime($post['created_at']);
+		$timediff = $now->diff($d);
 
-        $timediff_inSeconds = (string)$timediff->format('%s');
-        $timediff_inMinutes = (string)$timediff->format('%i');
-        $timediff_inHours = (string)$timediff->format('%h');
-        $timediff_inDays = (string)$timediff->format('%d');
-        $timediff_inMonth = (string)$timediff->format('%m');
+		$timediff_inSeconds = (string)$timediff->format('%s');
+		$timediff_inMinutes = (string)$timediff->format('%i');
+		$timediff_inHours = (string)$timediff->format('%h');
+		$timediff_inDays = (string)$timediff->format('%d');
+		$timediff_inMonth = (string)$timediff->format('%m');
 
-        if($timediff_inMonth!=0)
-        {
-                $timediff = $timediff_inMonth . "m";
-        }
-        else
-        {
-            if($timediff_inDays!=0)
-            {
-                $timediff = $timediff_inDays . "d";
-            }
-            else
-            {
-                if($timediff_inHours!=0)
-                {
-                    $timediff = $timediff_inHours . "h";
-                }
-                else
-                {
-                    if($timediff_inMinutes!=0)
-                    {
-                        $timediff = $timediff_inMinutes . "m";
-                    }
-                    else
-                    {
-                        $timediff = $timediff_inSeconds . "s";
-                    }
-                }
-            }
-        }
+		if($timediff_inMonth!=0)
+		{
+				$timediff = $timediff_inMonth . "m";
+		}
+		else
+		{
+			if($timediff_inDays!=0)
+			{
+				$timediff = $timediff_inDays . "d";
+			}
+			else
+			{
+				if($timediff_inHours!=0)
+				{
+					$timediff = $timediff_inHours . "h";
+				}
+				else
+				{
+					if($timediff_inMinutes!=0)
+					{
+						$timediff = $timediff_inMinutes . "m";
+					}
+					else
+					{
+						$timediff = $timediff_inSeconds . "s";
+					}
+				}
+			}
+		}
 
 
-        ?>
+		?>
         <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
             <content>
                 <?php 
-                if(isset($post['image_url']))
-                {
-                    $regexRest = '/[^\w$ .!?-]+/u';
+				if(isset($post['image_url']))
+				{
+					$regexRest = '/[^\w$ .!?-]+/u';
 
-                    echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
-                }
-                else {
-                    echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
-                }
-                ?>
+					echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
+				}
+				else {
+					echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
+				}
+				?>
             </content>
             <aside>
                 <?php
-                    if($this->isDetailedView)
-                    {?>
+					if($this->isDetailedView)
+					{?>
                         <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+					else
+					{?>
                         <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
@@ -108,12 +108,12 @@ 
                             <br />
                         <?php echo $post["vote_count"];?><br />
                 <?php
-                    if($this->isDetailedView)
-                    {?>
+					if($this->isDetailedView)
+					{?>
                         <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+					else
+					{?>
                         <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
@@ -136,39 +136,39 @@ 
                                 <a href="index.php?getPostDetails=true&view=<?php echo $this->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"];
-                                            } else echo "0";
-                                    ?>
+												echo $post["child_count"];
+											} else echo "0";
+									?>
                                     </a>
                             </span>
                             <?php } ?>
                         </td>
                         <td class="distance">
                             <?php
-                                if($this->isDetailedView)
-                                {
-                                    if(isset($post["parent_creator"]) && $post["parent_creator"] == 1)
-                                    {
-                                        ?>
+								if($this->isDetailedView)
+								{
+									if(isset($post["parent_creator"]) && $post["parent_creator"] == 1)
+									{
+										?>
                                         <span data-tooltip="Author">
                                             <i class="fa fa-user-o"></i> OJ |
                                         </span>
                                         <?php 
-                                    }
-                                    else
-                                    {
-                                        //Is not parent Jodel in detailed View
-                                        if(!array_key_exists('child_count', $post) && array_key_exists('parent_creator', $post))
-                                        {
-                                            ?>
+									}
+									else
+									{
+										//Is not parent Jodel in detailed View
+										if(!array_key_exists('child_count', $post) && array_key_exists('parent_creator', $post))
+										{
+											?>
                                             <span data-tooltip="Author">
                                                 <i class="fa fa-user-o"></i> #<?php echo $post["user_handle"];?> |
                                             </span>
                                             <?php
-                                        }
-                                    }
-                                }
-                                ?>
+										}
+									}
+								}
+								?>
 
                             <span class="tip" data-tooltip="Distance">
                                 <i class="fa fa-map-marker"></i>
@@ -181,7 +181,7 @@ 
             </footer>
         </article>
     <?php
-    }
+	}
 
 
 	/**
@@ -254,96 +254,96 @@ 
 
 	function getPosts($jodelAccount)
 	{
-        if($this->hashtag != '#all' && $this->hashtag != '' && $this->hashtag != NULL)
-        {
-            $accountCreator = new GetChannel();
-            $accountCreator->view = $this->view;
-            $accountCreator->setAccessToken($jodelAccount->accessToken);
-            $accountCreator->channel = $this->hashtag;
-            $accountCreator->lastPostId = $this->lastPostId;
-            $data = $accountCreator->execute();
-        }
-        else
-        {
-            if($this->lastPostId == '' && $this->view == 'combo')
-            {
-                $url = "/v3/posts/location/combo";
-            }
-            else
-            {
-                if($this->view == 'discussed')
-                {
-                    $url = "/v2/posts/location/discussed/";
-                }
-                else
-                {
-                    if($this->view == 'popular')
-                    {
-                        $url = "/v2/posts/location/popular/";
-                    }
-                    else
-                    {
-                        $url = "/v2/posts/location/";
-                    }
-                }
-            }
+		if($this->hashtag != '#all' && $this->hashtag != '' && $this->hashtag != NULL)
+		{
+			$accountCreator = new GetChannel();
+			$accountCreator->view = $this->view;
+			$accountCreator->setAccessToken($jodelAccount->accessToken);
+			$accountCreator->channel = $this->hashtag;
+			$accountCreator->lastPostId = $this->lastPostId;
+			$data = $accountCreator->execute();
+		}
+		else
+		{
+			if($this->lastPostId == '' && $this->view == 'combo')
+			{
+				$url = "/v3/posts/location/combo";
+			}
+			else
+			{
+				if($this->view == 'discussed')
+				{
+					$url = "/v2/posts/location/discussed/";
+				}
+				else
+				{
+					if($this->view == 'popular')
+					{
+						$url = "/v2/posts/location/popular/";
+					}
+					else
+					{
+						$url = "/v2/posts/location/";
+					}
+				}
+			}
 
-            $accountCreator = new GetPosts();
-            $accountCreator->setLastPostId($this->lastPostId);
-            $accountCreator->setAccessToken($jodelAccount->accessToken);
-            $accountCreator->setUrl($url);
-            $accountCreator->version = 'v3';
+			$accountCreator = new GetPosts();
+			$accountCreator->setLastPostId($this->lastPostId);
+			$accountCreator->setAccessToken($jodelAccount->accessToken);
+			$accountCreator->setUrl($url);
+			$accountCreator->version = 'v3';
 
-            $config = parse_ini_file('config/config.ini.php');
-            $location = new Location();
-            $location->setLat($config['default_lat']);
-            $location->setLng($config['default_lng']);
-            $location->setCityName($config['default_location']);
-            $accountCreator->location = $location;
-            $data = $accountCreator->execute();
-        }
-    	if(array_key_exists('recent', $data))
-        {
-            return $data['recent'];
-        }
-        else if(array_key_exists('posts', $data))
-        {
-            return $data['posts'];
-        }
-        else
-        {
-            error_log('Fehler View getPosts ');
-            error_log(print_r($data, true));
+			$config = parse_ini_file('config/config.ini.php');
+			$location = new Location();
+			$location->setLat($config['default_lat']);
+			$location->setLng($config['default_lng']);
+			$location->setCityName($config['default_location']);
+			$accountCreator->location = $location;
+			$data = $accountCreator->execute();
+		}
+		if(array_key_exists('recent', $data))
+		{
+			return $data['recent'];
+		}
+		else if(array_key_exists('posts', $data))
+		{
+			return $data['posts'];
+		}
+		else
+		{
+			error_log('Fehler View getPosts ');
+			error_log(print_r($data, true));
 
-            $notFound[0] = array(
-                "post_id" => "0",
-                "discovered_by" => 0,
-                "message" => "Not found",
-                "created_at" => "2017-02-11T16:44:50.385Z",
-                "updated_at" => "2017-02-11T16:44:50.385Z",
-                "pin_count" => 0,
-                "color" => "FFBA00",
-                "got_thanks" => FALSE,
-                "post_own" => "friend",
-                "discovered" => 0,
-                "distance" => 9,
-                "vote_count" => 0,
-                "location" =>
-                array("name" => "Berlin",
-                  "loc_coordinates" =>
-                  array(
-                    "lat" => 0,
-                    "lng" => 0
-                  ),
-                  "loc_accuracy" => 0,
-                  "country" => "",
-                  "city" => "",
-                ),
-                "tags" =>
-                array(),
-                "user_handle" => "0"
-            );
-            return $notFound;
-        }
+			$notFound[0] = array(
+				"post_id" => "0",
+				"discovered_by" => 0,
+				"message" => "Not found",
+				"created_at" => "2017-02-11T16:44:50.385Z",
+				"updated_at" => "2017-02-11T16:44:50.385Z",
+				"pin_count" => 0,
+				"color" => "FFBA00",
+				"got_thanks" => FALSE,
+				"post_own" => "friend",
+				"discovered" => 0,
+				"distance" => 9,
+				"vote_count" => 0,
+				"location" =>
+				array("name" => "Berlin",
+				  "loc_coordinates" =>
+				  array(
+					"lat" => 0,
+					"lng" => 0
+				  ),
+				  "loc_accuracy" => 0,
+				  "country" => "",
+				  "city" => "",
+				),
+				"tags" =>
+				array(),
+				"user_handle" => "0"
+			);
+			return $notFound;
+		}
 	}
 }
\ No newline at end of file

Braces +24 added lines, -12 removed lines

@@ -32,7 +32,8 @@ 
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
+ 	{
+//ToDO
         //Replace # with link
         //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -88,7 +89,8 @@ 
 
                     echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
                 }
-                else {
+                else
+                {
                     echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
                 }
                 ?>
@@ -96,11 +98,13 @@ 
             <aside>
                 <?php
                     if($this->isDetailedView)
-                    {?>
+                    {
+?>
                         <a href="index.php?vote=up&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+else
+                    {
+?>
                         <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
@@ -109,11 +113,13 @@ 
                         <?php echo $post["vote_count"];?><br />
                 <?php
                     if($this->isDetailedView)
-                    {?>
+                    {
+?>
                         <a href="index.php?vote=down&getPostDetails=true&postId=<?php echo $post['post_id'];?>&postId_parent=<?php echo htmlspecialchars($_GET['postId']);?>" rel="nofollow">
               <?php }
-                    else
-                    {?>
+else
+                    {
+?>
                         <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
@@ -131,13 +137,19 @@ 
                             </span> 
                         </td>
                         <td class="comments">
-                            <?php if(!$this->isDetailedView) {?>
+                            <?php if(!$this->isDetailedView)
+{
+?>
                             <span data-tooltip="Comments">
                                 <a href="index.php?getPostDetails=true&view=<?php echo $this->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>
@@ -303,7 +315,7 @@ 
             $data = $accountCreator->execute();
         }
     	if(array_key_exists('recent', $data))
-        {
+    	{
             return $data['recent'];
         }
         else if(array_key_exists('posts', $data))

php/jodel-web.php

Indentation +36 added lines, -36 removed lines

@@ -41,36 +41,36 @@ 
 
 function isUserBot()
 {
-    preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches);
+	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 configPropertyExists($config, $property)
 {
-    if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
-    {
-        return FALSE;
-    }
-    else
-    {
-        return TRUE;
-    }
+	if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+	{
+		return FALSE;
+	}
+	else
+	{
+		return TRUE;
+	}
 }
 
 function isDeviceUidInDatabase($deviceUid)
 {
-    $db = new DatabaseConnect();  
-    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
-
-    if ($result->num_rows > 0)
-    {
-        return TRUE;
-    }
-    else
-    {
-        return FALSE;
-    }
+	$db = new DatabaseConnect();  
+	$result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+
+	if ($result->num_rows > 0)
+	{
+		return TRUE;
+	}
+	else
+	{
+		return FALSE;
+	}
 }
 
 	//Check if it's a Spider or Google Bot
@@ -97,14 +97,14 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
-    	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
-    }
-    else
-    {
-    	error_log("No Karma deviceUid set in config file");
+	{
+		$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
+	}
+	else
+	{
+		error_log("No Karma deviceUid set in config file");
 		$jodelAccountForKarma = new JodelAccount($deviceUid);
-    }
+	}
 
 	/*
 	 * Cunstruct View
@@ -212,14 +212,14 @@ 
 	{
 		$jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']);
 		if(isset($_GET['getPostDetails']) && isset($_GET['getPostDetails']))
-        {
-            header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
-        }
-        else
-        {
-            header("Location: index.php#postId-" . htmlspecialchars($_GET['postId']));
-        }   
-        die();
+		{
+			header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
+		}
+		else
+		{
+			header("Location: index.php#postId-" . htmlspecialchars($_GET['postId']));
+		}   
+		die();
 	}
 	
 	//SendJodel

Braces +4 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
 	}
 	
 	if(configPropertyExists($config, 'karmaDeviceUid'))
-    {
+	{
     	$jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']);
     }
     else
@@ -165,7 +165,8 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch ($_GET['view'])
+		{
 			case 'discussed':
 				$view = 'discussed';
 				break;
@@ -212,7 +213,7 @@ 
 	{
 		$jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']);
 		if(isset($_GET['getPostDetails']) && isset($_GET['getPostDetails']))
-        {
+		{
             header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId']));
         }
         else

template/nav-bottom.php

Braces +15 added lines, -3 removed lines

@@ -2,13 +2,25 @@
 	<div class="col-xs-12">
 		<div class="row">
 			<div class="col-xs-3">
-				<a href="<?php echo $baseUrl;?>index.php" <?php if($view->view=='combo') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
+				<a href="<?php echo $baseUrl;?>index.php" <?php if($view->view=='combo')
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-clock-o fa-3x"></i></a>
 			</div>
 			<div class="col-xs-3">
-				<a href="<?php echo $baseUrl;?>index.php?view=discussed" <?php if($view->view=='discussed') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
+				<a href="<?php echo $baseUrl;?>index.php?view=discussed" <?php if($view->view=='discussed')
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-commenting-o fa-3x"></i></a>
 			</div>
 			<div class="col-xs-3">
-				<a href="<?php echo $baseUrl;?>index.php?view=popular" <?php if($view->view=='popular') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
+				<a href="<?php echo $baseUrl;?>index.php?view=popular" <?php if($view->view=='popular')
+{
+	echo 'class="active"';
+}
+?>><i class="fa fa-angle-up fa-3x"></i></a>
 			</div>
 			<div class="col-xs-3">
 				<nav>

index.php

Braces +25 added lines, -7 removed lines

@@ -20,7 +20,8 @@ 
 
 		$posts[0] = $data;
 
-		if(array_key_exists('children', $data)) {
+		if(array_key_exists('children', $data))
+		{
 			foreach($data['children'] as $key => $child)
 			{
 				
@@ -124,7 +125,11 @@ 
 
 					<div id="location_mobile" class="hidden-sm-up">
 						<form method="get">
-							<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+							<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 
 							<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
 						</form>
@@ -146,7 +151,9 @@ 
 							} ?>
 					</content>
 					
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -159,7 +166,11 @@ 
 							<div>
 								<h2>Position / Hashtag</h2>
 								<form method="get">
-									<input type="text" id="city" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
+									<input type="text" id="city" name="search" placeholder="<?php if(isset($newPositionStatus))
+{
+	echo $newPositionStatus;
+}
+?>" required>
 									<label>try: #jhj</label><br>
 									<input type="submit" value="Set Location" /> 
 								</form>
@@ -175,7 +186,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']);?>" />
@@ -183,7 +196,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> 
@@ -242,7 +258,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']))
+{
+?>