mmainstreet / jodel-web

error-pages/410.php

Spacing +1 added lines, -1 removed lines

@@ -66,4 +66,4 @@
 		</article>
 	</div>
 </div>
-<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php');?>
\ No newline at end of file
+<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php'); ?>
\ No newline at end of file

index.php

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

@@ -49,7 +49,7 @@
 	}
 	if(!isset($posts[0]))
 	{
-		error_log('Fehler: ' . print_r($posts, true) . print_r($posts['recent'], true) . print_r($posts['posts'], true));
+		error_log('Fehler: ' . print_r($posts, TRUE) . print_r($posts['recent'], TRUE) . print_r($posts['posts'], TRUE));
 		$title = $view->getTitle();
 		$description = $view->getMetaDescription();
 	}

Spacing +3 added lines, -3 removed lines

@@ -104,7 +104,7 @@ 
 				</article>
 			
 				<aside class="topSidebar col-sm-4 sidebar-outer">
-					<div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile');?>">
+					<div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile'); ?>">
 						<article>
 							<div>
 								<h2>Position / Hashtag</h2>
@@ -141,7 +141,7 @@ 
 									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']);?>" />
+											<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']); ?>" />
 											<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
 										<br />
 										<input type="submit" value="SEND" /> 
@@ -203,7 +203,7 @@ 
 					</div>
 				</aside>
 			</div>
-			<?php include 'templates/nav-bottom.php';?>
+			<?php include 'templates/nav-bottom.php'; ?>
 		</div>
 		<?php
 			$includeEmojiAndAjax = TRUE;

Braces +21 added lines, -6 removed lines

@@ -96,7 +96,9 @@ 
 							} ?>
 					</content>
 					
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
+{
+?>
 						<p id="loading">
 							Loading…
 						</p>
@@ -104,12 +106,20 @@ 
 				</article>
 			
 				<aside class="topSidebar col-sm-4 sidebar-outer">
-					<div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile');?>">
+					<div class="fixed<?php if(!$view->isDetailedView)
+{
+	echo(' hide-mobile');
+}
+?>">
 						<article>
 							<div>
 								<h2>Position / Hashtag</h2>
 								<form action="index.php" 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>
@@ -126,7 +136,7 @@ 
 						<article>
 							<div>
 								<?php if(!$jodelAccountForView->isAccountVerified())
-								{
+{
 								?>
 								<h2>New Jodel</h2>
 								
@@ -138,7 +148,9 @@ 
 								{
 
 
-									if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
+									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']);?>" />
@@ -146,7 +158,10 @@ 
 										<br />
 										<input type="submit" value="SEND" /> 
 									</form>
-										<?php } else { ?>
+										<?php }
+else
+{
+?>
 									<h2>New Jodel</h2>
 									<form enctype="multipart/form-data" method="POST">
 										<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> 

php/CustomError.php

Indentation +11 added lines, -11 removed lines

@@ -13,17 +13,17 @@
 	public $varsToDump;
 
 	function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set')
-    {
-        $this->view = $view;
-        $this->actions = $actions;
-        $this->accountId = $accountId;
-        $this->isVerified = $isVerified;
-        $this->isTokenFresh = $isTokenFresh;
-        $this->page = $page;
-        $this->referrer = $referrer;
-        $this->msg = $msg;
-        $this->varsToDump = $varsToDump;
-    }
+	{
+		$this->view = $view;
+		$this->actions = $actions;
+		$this->accountId = $accountId;
+		$this->isVerified = $isVerified;
+		$this->isTokenFresh = $isTokenFresh;
+		$this->page = $page;
+		$this->referrer = $referrer;
+		$this->msg = $msg;
+		$this->varsToDump = $varsToDump;
+	}
 
 	function writeErrorToLog()
 	{

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	public $varsToDump;
 
 	function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set')
-    {
+	{
         $this->view = $view;
         $this->actions = $actions;
         $this->accountId = $accountId;

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

@@ -29,7 +29,7 @@
 	{
 		error_log("=============================== ERROR ================================");
 		error_log("msg: " . $this->msg);
-		error_log("view: " . print_r($this->view, true));
+		error_log("view: " . print_r($this->view, TRUE));
 		error_log("actions: " . $this->actionsToString());
 		error_log("accountId: " . $this->accountId);
 		error_log("isVerified: " . $this->isVerified);

php/View.php

Braces +13 added lines, -6 removed lines

@@ -34,7 +34,8 @@ 
 	 * Compute HTML Code
 	 */
  	function jodelToHtml($post)
-    {   //ToDO
+ 	{
+//ToDO
         //Replace # with link
         //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text);
 
@@ -90,7 +91,8 @@ 
 
                     echo '<img src="' . $post['image_url'] . '" alt="' . htmlspecialchars(preg_replace($regexRest, '', $post['message'])) . '">';
                 }
-                else {
+                else
+                {
                     echo str_replace('  ', ' &nbsp;', nl2br(htmlspecialchars($post['message'])));
                 }
                 ?>
@@ -116,15 +118,20 @@ 
                                 <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
                             </span> 
                         </span>
-						<?php if(!$this->isDetailedView) {?>
+						<?php if(!$this->isDetailedView)
+{
+?>
                         <span class="comments">
                             <span data-tooltip="Comments">
                                 <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
                                     <i class="fa fa-commenting-o"></i>
                                     <?php if(array_key_exists("child_count", $post))
-                                    {
+{
                                         echo $post["child_count"];
-                                    } else echo "0";
+                                    }
+                                    else {
+                                    	echo "0";
+                                    }
                                     ?>
                                 </a>
                             </span>
@@ -306,7 +313,7 @@ 
             $data = $accountCreator->execute();
         }
     	if(array_key_exists('recent', $data) && array_key_exists(0, $data['recent']))
-        {
+    	{
             return $data['recent'];
         }
         else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))

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

@@ -317,7 +317,7 @@
         {
             if($this->lastPostId == '')
             {
-                error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
+                error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, TRUE));
                 //error_log(print_r($data, true));
 
                 $notFound[0] = array(

Indentation +239 added lines, -239 removed lines

@@ -2,112 +2,112 @@ 
 
 class View
 {
-    public $country;
-    public $city;
-    public $hashtag;
+	public $country;
+	public $city;
+	public $hashtag;
 	public $view;
-    public $postId;
-    public $isDetailedView;
-    public $baseUrl;
-    public $rights;
+	public $postId;
+	public $isDetailedView;
+	public $baseUrl;
+	public $rights;
 
 	public $lastPostId = '';
 
-    function __construct($baseUrl, $country, $city, $hashtag = '%23all', $view = 'time', $postId = '')
-    {
-        $this->baseUrl = $baseUrl;
-        $this->country = $country;
-        $this->city = $city;
-        $this->hashtag = urldecode($hashtag);
-        $this->view = $view;
-        $this->postId = $postId;
+	function __construct($baseUrl, $country, $city, $hashtag = '%23all', $view = 'time', $postId = '')
+	{
+		$this->baseUrl = $baseUrl;
+		$this->country = $country;
+		$this->city = $city;
+		$this->hashtag = urldecode($hashtag);
+		$this->view = $view;
+		$this->postId = $postId;
 
-        if(isUserAdmin())
-        {
-            $this->rights = 'admin';
-        }
-        else if(isUserVoter())
-        {
-            $this->rights = 'voter';
-        }
-        else
-        {
-            $this->rights = 'user';
-        }
+		if(isUserAdmin())
+		{
+			$this->rights = 'admin';
+		}
+		else if(isUserVoter())
+		{
+			$this->rights = 'voter';
+		}
+		else
+		{
+			$this->rights = 'user';
+		}
 
-        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>                    
                 <button onclick="vote('<?php echo $post['post_id'];?>', 'up', this)">
@@ -136,10 +136,10 @@ 
                                 <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
                                     <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>
                             
@@ -159,30 +159,30 @@ 
 						?>
                         <span class="distance">
                             <?php
-                                if($this->isDetailedView)
-                                {
-                                    if(isset($post['user_handle']) && $post['user_handle'] == 'OJ')
-                                    {
-                                        ?>
+								if($this->isDetailedView)
+								{
+									if(isset($post['user_handle']) && $post['user_handle'] == 'OJ')
+									{
+										?>
                                         <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))
-                                        {
-                                            ?>
+									}
+									else
+									{
+										//Is not parent Jodel in detailed View
+										if(!array_key_exists('child_count', $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>
@@ -195,7 +195,7 @@ 
             </footer>
         </article>
     <?php
-    }
+	}
 
 
 	/**
@@ -232,147 +232,147 @@ 
 		return $description;
 	}
 
-    function toUrl($msg = '')
-    {
-        $url = $this->baseUrl . 'index.php?country=DE' .
-                            '&city=' . urlencode($this->city) .
-                            '&hashtag=' . urlencode($this->hashtag) . 
-                            '&view=' . $this->view;
-        if($this->postId != '')
-        {
-            $url .= '&postId=' . $this->postId . 
-                    '&getPostDetails=TRUE';
-        }
+	function toUrl($msg = '')
+	{
+		$url = $this->baseUrl . 'index.php?country=DE' .
+							'&city=' . urlencode($this->city) .
+							'&hashtag=' . urlencode($this->hashtag) . 
+							'&view=' . $this->view;
+		if($this->postId != '')
+		{
+			$url .= '&postId=' . $this->postId . 
+					'&getPostDetails=TRUE';
+		}
 
-        if($msg != '')
-        {
-            $url .= '&msg=' . urlencode($msg);
-        }
+		if($msg != '')
+		{
+			$url .= '&msg=' . urlencode($msg);
+		}
 
-        return $url;
-    }
+		return $url;
+	}
 
-    function changePostId($postId)
-    {
-        $tempView = clone $this;
-        $tempView->postId = $postId;
-        $tempView->isDetailedView = TRUE;
-        return $tempView;
-    }
+	function changePostId($postId)
+	{
+		$tempView = clone $this;
+		$tempView->postId = $postId;
+		$tempView->isDetailedView = TRUE;
+		return $tempView;
+	}
 
-    function back()
-    {
-        $tempView = clone $this;
-        $tempView->postId = '';
-        return $tempView;
-    }
+	function back()
+	{
+		$tempView = clone $this;
+		$tempView->postId = '';
+		return $tempView;
+	}
 
-    function changeView($view)
-    {
-        $tempView = clone $this;
-        $tempView->view = $view;
-        return $tempView;
-    }
+	function changeView($view)
+	{
+		$tempView = clone $this;
+		$tempView->view = $view;
+		return $tempView;
+	}
 
 	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) && array_key_exists(0, $data['recent']))
-        {
-            return $data['recent'];
-        }
-        else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
-        {
-            return $data['posts'];
-        }
-        else
-        {
-            if($this->lastPostId == '')
-            {
-                error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
-                //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) && array_key_exists(0, $data['recent']))
+		{
+			return $data['recent'];
+		}
+		else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
+		{
+			return $data['posts'];
+		}
+		else
+		{
+			if($this->lastPostId == '')
+			{
+				error_log('Could not find Posts in: ' . $this->city . ' Error: ' . print_r($data, true));
+				//error_log(print_r($data, true));
 
-                $notFound[0] = array(
-                    "post_id" => "0",
-                    "discovered_by" => 0,
-                    "message" => "No more Posts found",
-                    "created_at" => "2017-02-11T16:44:50.385Z",
-                    "updated_at" => "2017-02-11T16:44:50.385Z",
-                    "pin_count" => 0,
-                    "color" => "5682a3",
-                    "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;
-            }
-            else
-            {
-                return FALSE;
-            }
-        }
+				$notFound[0] = array(
+					"post_id" => "0",
+					"discovered_by" => 0,
+					"message" => "No more Posts found",
+					"created_at" => "2017-02-11T16:44:50.385Z",
+					"updated_at" => "2017-02-11T16:44:50.385Z",
+					"pin_count" => 0,
+					"color" => "5682a3",
+					"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;
+			}
+			else
+			{
+				return FALSE;
+			}
+		}
 	}
 }

Spacing +16 added lines, -16 removed lines

@@ -63,25 +63,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";
                     }
@@ -95,7 +95,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']))
@@ -110,12 +110,12 @@ 
                 ?>
             </content>
             <aside>                    
-                <button onclick="vote('<?php echo $post['post_id'];?>', 'up', this)">
+                <button onclick="vote('<?php echo $post['post_id']; ?>', 'up', this)">
                     <i class="fa fa-angle-up fa-3x"></i>
                 </button>    
-                <br><span><?php echo $post["vote_count"];?></span><br>
+                <br><span><?php echo $post["vote_count"]; ?></span><br>
 
-                <button onclick="vote('<?php echo $post['post_id'];?>', 'down', this)">
+                <button onclick="vote('<?php echo $post['post_id']; ?>', 'down', this)">
                     <i class="fa fa-angle-down fa-3x"></i>
                 </button>
             </aside>
@@ -126,14 +126,14 @@ 
                         <span 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> 
                         </span>
 						<?php if(!$this->isDetailedView) {?>
                         <span class="comments">
                             <span data-tooltip="Comments">
-                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
+                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl(); ?>">
                                     <i class="fa fa-commenting-o"></i>
                                     <?php if(array_key_exists("child_count", $post))
                                     {
@@ -176,7 +176,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
                                         }
@@ -186,8 +186,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>
                         </span>
                     
@@ -226,7 +226,7 @@ 
 
 		if($post != '' && array_key_exists('message', $post) && $post['message'] != '' && $this->isDetailedView)
 		{
-			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) .  ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
+			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) . ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
 		}
 
 		return $description;
@@ -328,7 +328,7 @@ 
         {
             return $data['recent'];
         }
-        else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
+        else if(array_key_exists('posts', $data) && array_key_exists(0, $data['posts']))
         {
             return $data['posts'];
         }

templates/captcha.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 ?>
 <div id="captchaWrapper">
 	<p>Check all images with Coons on it (Coons look like <img style="height: 1.0em; width: unset;" src="img/coon.png">).</p>
-	<img src="<?php echo $captcha['image_url'];?>">
+	<img src="<?php echo $captcha['image_url']; ?>">
 	<div class='captchaWrapper'>
 		<input id='box_0' type='checkbox'>
 		<input id='box_1' type='checkbox'>
@@ -17,5 +17,5 @@ 
 		<input id='box_7' type='checkbox'>
 		<input id='box_8' type='checkbox'>
 	</div>
-	<button onClick="verifyAccount('<?php echo $captcha['key'];?>','<?php echo $jodelAccountForView->deviceUid?>')">Verify</button>
+	<button onClick="verifyAccount('<?php echo $captcha['key']; ?>','<?php echo $jodelAccountForView->deviceUid?>')">Verify</button>
 </div>
\ No newline at end of file

vote-ajax.php

Braces +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 	{
 		$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "deviceUid" => $deviceUid);
 	}
-	else 
+	else
 	{
 		$response = array("success" => $success, "message" => $message);
 	}

Spacing +3 added lines, -3 removed lines

@@ -21,8 +21,8 @@ 
 
 if(!$userIsVoter && !$userIsAdmin)
 {
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
-	$response = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php');
+	$response = array("message" => $_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php', "success" => false);
 	echo json_encode($response);
 	die();
 }
@@ -141,7 +141,7 @@ 
 			}
 		}
 
-	if (isset($captcha))
+	if(isset($captcha))
 	{
 		$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "deviceUid" => $deviceUid);
 	}

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

@@ -22,7 +22,7 @@ 
 if(!$userIsVoter && !$userIsAdmin)
 {
 	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
-	$response = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
+	$response = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => FALSE);
 	echo json_encode($response);
 	die();
 }
@@ -39,7 +39,7 @@ 
 		if($remaining_votes <= 0)
 		{
 			$message = 'This voter account run out of votes. For more information please contact info@jodelblue.com';
-			$success = false;
+			$success = FALSE;
 
 			$response = array("success" => $success, "message" => $message);
 			echo json_encode($response);
@@ -49,7 +49,7 @@ 
 		
 
 	$message = "";
-	$success = true;
+	$success = TRUE;
 	$token = "";
 		if(isset($_POST['vote']) && isset($_POST['postId']))
 		{
@@ -118,7 +118,7 @@ 
 						//$response = array("success" => $jodelAccount->verifyCaptcha());
 						//echo json_encode($response);
 						//die();
-					$success = false;
+					$success = FALSE;
 				}
 				else
 				{
@@ -126,7 +126,7 @@ 
 					$result = $db->query("UPDATE users 
                                 SET remaining_votes='" . $remaining_votes . "'
                                 WHERE user_token='" . $_COOKIE['JodelVoterPassword'] . "'");
-					if($result === false)
+					if($result === FALSE)
 					{
                			error_log("Update remaining votes failed: (" . $db->errno . ") " . $db->error);
                		}
@@ -137,7 +137,7 @@ 
 			else
 			{
 				$message = 'There is no account available for this jodel. Please create at least one new account to vote this jodel.';
-				$success = false;
+				$success = FALSE;
 			}
 		}
 

Indentation +5 added lines, -5 removed lines

@@ -5,8 +5,8 @@ 
 if(isset($_GET['postId']) && $_GET['vote'])
 {
 	header('Content-Type: application/json');
-    echo json_encode($jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']));
-    die();
+	echo json_encode($jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']));
+	die();
 }
 
 if(isset($_GET['solution']) && isset($_POST['deviceUid']))
@@ -128,9 +128,9 @@ 
                                 WHERE user_token='" . $_COOKIE['JodelVoterPassword'] . "'");
 					if($result === false)
 					{
-               			error_log("Update remaining votes failed: (" . $db->errno . ") " . $db->error);
-               		}
-               		$db->close();
+			   			error_log("Update remaining votes failed: (" . $db->errno . ") " . $db->error);
+			   		}
+			   		$db->close();
 					$jodelAccount->votePostId($_POST['postId'], $_POST['vote']);
 				}
 			}

admin.php

Indentation +9 added lines, -9 removed lines

@@ -44,17 +44,17 @@
 {
 	//insert voter into db
 	$db = new DatabaseConnect();
-    $result = $db->query("INSERT INTO users (user_token, remaining_votes, device_uid, rights)
+	$result = $db->query("INSERT INTO users (user_token, remaining_votes, device_uid, rights)
                     VALUES ('" 	. $db->escape_string($_POST['user_token'])
-                    	. "','" . $db->escape_string($_POST['remaining_votes'])
-                    	. "','" . $db->escape_string($_POST['device_uid'])
-                    	. "','" . $db->escape_string($_POST['rights']) . "')");
+						. "','" . $db->escape_string($_POST['remaining_votes'])
+						. "','" . $db->escape_string($_POST['device_uid'])
+						. "','" . $db->escape_string($_POST['rights']) . "')");
     
-    if($result === false){
-            $error = db_error();
-            error_log($error);
-            error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
-    } 
+	if($result === false){
+			$error = db_error();
+			error_log($error);
+			error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
+	} 
 }
 
 //Vote

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

@@ -20,14 +20,14 @@ 
 
 if(isUserAdmin())
 {
-	$userIsAdmin = true;
-	$userIsVoter = true;
+	$userIsAdmin = TRUE;
+	$userIsVoter = TRUE;
 	$votesRemaining = 'Unlimited';
 }
 else if(isUserVoter())
 {
-	$userIsAdmin = false;
-	$userIsVoter = true;
+	$userIsAdmin = FALSE;
+	$userIsVoter = TRUE;
 
 	$result = $db->query("SELECT user_token, remaining_votes FROM users WHERE user_token = '" . $_COOKIE['JodelVoterPassword'] . "'");
 	if($result->num_rows > 0)
@@ -62,7 +62,7 @@ 
                     	. "','" . $db->escape_string($_POST['device_uid'])
                     	. "','" . $db->escape_string($_POST['rights']) . "')");
     
-    if($result === false){
+    if($result === FALSE){
             $error = db_error();
             error_log($error);
             error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);

Spacing +41 added lines, -41 removed lines

@@ -5,14 +5,14 @@ 
 
 if(isset($_GET['pw']))
 {
-	setcookie('JodelAdminPassword', $_GET['pw'], time()+60*60*24*365*10);
+	setcookie('JodelAdminPassword', $_GET['pw'], time() + 60 * 60 * 24 * 365 * 10);
 	error_log('admin password saved for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 	header('Location: ' . $baseUrl . 'admin.php');
 	exit;
 }
 else if(isset($_GET['voterPw']))
 {
-	setcookie('JodelVoterPassword', $_GET['voterPw'], time()+60*60*24*365*10);
+	setcookie('JodelVoterPassword', $_GET['voterPw'], time() + 60 * 60 * 24 * 365 * 10);
 	error_log('voter password saved for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 	header('Location: ' . $baseUrl);
 	exit;
@@ -42,7 +42,7 @@ 
 }
 else
 {
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong voterPw / pw on admin.php');
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong voterPw / pw on admin.php');
 	die();
 }
 
@@ -62,7 +62,7 @@ 
                     	. "','" . $db->escape_string($_POST['device_uid'])
                     	. "','" . $db->escape_string($_POST['rights']) . "')");
     
-    if($result === false){
+    if($result === false) {
             $error = db_error();
             error_log($error);
             error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
@@ -110,42 +110,42 @@ 
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client">
 		
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/css/bootstrap.min.css" integrity="sha384-AysaV+vQoT3kOAXZkl02PThvDr8HYKPZhNT5h/CXfBThSRXQ6jW5DO2ekP5ViFdi" crossorigin="anonymous">
-				<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
+				<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
 		
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
 		<meta name="msapplication-TileColor" content="#5682a3"> 
 		<meta name="msapplication-navbutton-color" content="#5682a3"> 
 		<meta name="application-name" content="JodelBlue"/> 
 		<meta name="msapplication-tooltip" content="JodelBlue"/> 
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/> 
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png"> 
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png"> 
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png"> 
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png"> 
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png"> 
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png"> 
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png"> 
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png"> 
 	</head>
 	
 	<body>
@@ -217,7 +217,7 @@ 
 						?>
 							<div class="row">								
 								<div class="col-12 col-sm-12">
-								<h2>Voting (<?php echo $votesRemaining;?> votes remaining)</h2>
+								<h2>Voting (<?php echo $votesRemaining; ?> votes remaining)</h2>
 									<form>
 										<div class="form-group">
 											<label for="quantityDelay">Quantity</label>
@@ -226,20 +226,20 @@ 
 										<div class="form-group">
 											<label for="minDelay">Minimum delay</label>
 											<div class="input-group">
-												<input placeholder="min interval" class="form-control" id="minDelay" value="<?php echo $config['minInterval'];?>" type="number" name="min">
+												<input placeholder="min interval" class="form-control" id="minDelay" value="<?php echo $config['minInterval']; ?>" type="number" name="min">
 												<span class="input-group-addon">seconds</span>
 											</div>
 										</div>
 										<div class="form-group">
 											<label for="maxDelay">Maximum delay</label>
 											<div class="input-group">
-												<input placeholder="max interval" class="form-control" id="maxDelay" value="<?php echo $config['maxInterval'];?>" type="number" name="max">
+												<input placeholder="max interval" class="form-control" id="maxDelay" value="<?php echo $config['maxInterval']; ?>" type="number" name="max">
 												<span class="input-group-addon">seconds</span>
 											</div>
 										</div>
 										<div class="form-group">
 											<label for="postIdDelay">Post Id</label>
-											<input placeholder="postId" class="form-control" id="postIdDelay" value="<?php if(isset($_GET['postId'])) echo $_GET['postId'];?>" type="text" name="postId">
+											<input placeholder="postId" class="form-control" id="postIdDelay" value="<?php if(isset($_GET['postId'])) echo $_GET['postId']; ?>" type="text" name="postId">
 										</div>
 										<div class="row">
 											<div class="col-6 col-xs-6"><button type="button" name="vote" value="up" class="half" onclick="voteWithAjax('up');">Upvote</button></div>
@@ -265,7 +265,7 @@ 
 			  crossorigin="anonymous"></script>
 	    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
 	    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
-	    <script src="<?php echo $baseUrl;?>js/jQueryEmoji.js"></script>
+	    <script src="<?php echo $baseUrl; ?>js/jQueryEmoji.js"></script>
 	    <script src="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.1.1/ekko-lightbox.min.js" integrity="sha256-1odJPEl+KoMUaA1T7QNMGSSU/r5LCKCRC6SL8P0r2gY=" crossorigin="anonymous"></script>
 
 		<script>
@@ -309,7 +309,7 @@ 
 			{
 				$.ajax({
 				  type: "POST",
-				  url: "<?php echo $baseUrl;?>vote-ajax.php",
+				  url: "<?php echo $baseUrl; ?>vote-ajax.php",
 				  data: {"vote" : data["vote"],
 						 "postId" : data["id"]},
 				  success: function(result){
@@ -363,7 +363,7 @@ 
 				console.log(solution);
 				$.ajax({
 				  type: "POST",
-				  url: "<?php echo $baseUrl;?>vote-ajax.php?solution=" + solution + "&key="+key,
+				  url: "<?php echo $baseUrl; ?>vote-ajax.php?solution=" + solution + "&key="+key,
 				  data: {"deviceUid" : deviceUid},
 				  success: function(result){
 					  var response = JSON.parse(result);

Braces +12 added lines, -4 removed lines

@@ -62,7 +62,8 @@ 
                     	. "','" . $db->escape_string($_POST['device_uid'])
                     	. "','" . $db->escape_string($_POST['rights']) . "')");
     
-    if($result === false){
+    if($result === false)
+    {
             $error = db_error();
             error_log($error);
             error_log("Adding Voter failed: (" . $result->errno . ") " . $result->error);
@@ -165,7 +166,9 @@ 
 			<div class="row">
 				<article class="topContent col-12 col-sm-12">
 					<content id="posts" class="adminpanel">
-						<?php if($userIsAdmin) { ?>
+						<?php if($userIsAdmin)
+{
+?>
 							<div class="row">
 								<div class="col-md-12">
 									<h2>Account management</h2>
@@ -213,7 +216,8 @@ 
 						<?php
 						}
 
-						if($userIsVoter) {
+						if($userIsVoter)
+						{
 						?>
 							<div class="row">								
 								<div class="col-12 col-sm-12">
@@ -239,7 +243,11 @@ 
 										</div>
 										<div class="form-group">
 											<label for="postIdDelay">Post Id</label>
-											<input placeholder="postId" class="form-control" id="postIdDelay" value="<?php if(isset($_GET['postId'])) echo $_GET['postId'];?>" type="text" name="postId">
+											<input placeholder="postId" class="form-control" id="postIdDelay" value="<?php if(isset($_GET['postId']))
+{
+	echo $_GET['postId'];
+}
+?>" type="text" name="postId">
 										</div>
 										<div class="row">
 											<div class="col-6 col-xs-6"><button type="button" name="vote" value="up" class="half" onclick="voteWithAjax('up');">Upvote</button></div>

php/Requests/AbstractRequest.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if($this->getAccessToken()) {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -52,7 +52,7 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch($this->getMethod()) {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -73,7 +73,7 @@ 
 
         http_response_code($result->status_code);
 
-        switch ($result->status_code) {
+        switch($result->status_code) {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -116,7 +116,7 @@ 
             case 502:
                 error_log('Error 502 - ' . print_r($result, true));
                 $result = json_decode($result->body, true);
-                header('location:'.$_SERVER['PHP_SELF']);
+                header('location:' . $_SERVER['PHP_SELF']);
                 break;
             case 503:
                 error_log('Error 503 - ' . print_r($result, true));
@@ -124,11 +124,11 @@ 
 
                 if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
                 {
-                    header('location:'.$_SERVER['PHP_SELF']); 
+                    header('location:' . $_SERVER['PHP_SELF']); 
                 }
                 break;
             default:
-                error_log('Error '.$result->status_code.' - unknown error');
+                error_log('Error ' . $result->status_code . ' - unknown error');
                 $result = json_decode($result->body, true);
         }
 

Indentation +159 added lines, -159 removed lines

@@ -2,21 +2,21 @@ 
 
 abstract class AbstractRequest
 {	
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
-    const APIURL = 'https://api.go-tellm.com/api';
-    const SECRET = 'cYjTAwjdJyiuXAyrMhkCDiVZhshhLhotNotLiPVu';
-    const USERAGENT = 'Jodel/4.35.6 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
-    const CLIENT_TYPE = 'android_4.35.6';
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
+	const APIURL = 'https://api.go-tellm.com/api';
+	const SECRET = 'cYjTAwjdJyiuXAyrMhkCDiVZhshhLhotNotLiPVu';
+	const USERAGENT = 'Jodel/4.35.6 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
+	const CLIENT_TYPE = 'android_4.35.6';
     
-    private $accessToken = null;
-    private $payLoad;
-    public $expects = '';
-    public $version = 'v2';
-    public $hasPayload = FALSE;
+	private $accessToken = null;
+	private $payLoad;
+	public $expects = '';
+	public $version = 'v2';
+	public $hasPayload = FALSE;
 
-    public function execute()
-    {
-        $result = new \stdClass();
+	public function execute()
+	{
+		$result = new \stdClass();
 		        
 		$this->payLoad = $this->getPayload();
 		$device_uid = '';
@@ -25,16 +25,16 @@ 
 		}
 				
 				
-        $this->payLoad = json_encode($this->payLoad);
-        $header = $this->getSignHeaders();
-        $url = $this->getFullUrl();
+		$this->payLoad = json_encode($this->payLoad);
+		$header = $this->getSignHeaders();
+		$url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
-        }
-        //Comment out to debug the Request:
+		if ($this->getAccessToken()) {
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
+		}
+		//Comment out to debug the Request:
 
-        /*
+		/*
         printf("URL: ");
         var_dump($url);
         echo "<br />";
@@ -45,112 +45,112 @@ 
         var_dump($this->payLoad);
         echo "<br />";
         */
-        /*
+		/*
         $options = array(
             'timeout' => 100,
             'connect_timeout' => 100,
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
-            case 'POST':
-                $result = Requests::post($url, $header, $this->payLoad);
-                break;
-            case 'GET':
-                if($this->hasPayload)
-                {
-                    $result = Requests::get($url, $header, $this->payLoad);
-                }
-                else
-                {
-                    $result = Requests::get($url, $header);
-                }
-                break;
-            case 'PUT':
-                $result = Requests::put($url, $header, $this->payLoad);
-                break;
-        }
+		switch ($this->getMethod()) {
+			case 'POST':
+				$result = Requests::post($url, $header, $this->payLoad);
+				break;
+			case 'GET':
+				if($this->hasPayload)
+				{
+					$result = Requests::get($url, $header, $this->payLoad);
+				}
+				else
+				{
+					$result = Requests::get($url, $header);
+				}
+				break;
+			case 'PUT':
+				$result = Requests::put($url, $header, $this->payLoad);
+				break;
+		}
 
-        http_response_code($result->status_code);
+		http_response_code($result->status_code);
 
-        switch ($result->status_code) {
-            case 200:
-                $result = json_decode($result->body, true);
-                break;
-            case 204:
-                $result = 'Success';
-                http_response_code(200);
-                break;
-            case 400:
-                $result = json_decode($result->body, true);
-                error_log('Error 400 - ' . print_r($result, true));
-                break;
-            case 401:
-                $result = json_decode($result->body, true);
+		switch ($result->status_code) {
+			case 200:
+				$result = json_decode($result->body, true);
+				break;
+			case 204:
+				$result = 'Success';
+				http_response_code(200);
+				break;
+			case 400:
+				$result = json_decode($result->body, true);
+				error_log('Error 400 - ' . print_r($result, true));
+				break;
+			case 401:
+				$result = json_decode($result->body, true);
 
-                if(array_key_exists('error', $result) && $result['error'] == 'length')
-                {
+				if(array_key_exists('error', $result) && $result['error'] == 'length')
+				{
 
-                }
-                else
-                {
-                    error_log('Error 401 - ' . print_r($result, true));
-                }
-                break;
-            case 404:
-                error_log('Error 404 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
-                break;
+				}
+				else
+				{
+					error_log('Error 401 - ' . print_r($result, true));
+				}
+				break;
+			case 404:
+				error_log('Error 404 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
+				break;
 			case 477:
-                $result = json_decode($result->body, true);
-                error_log('Error 477 - ' . print_r($result, true));
-                break;
-            case 429:
-                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
-            	exit("Error 429: Too Many Requests");
-            	break;
-            case 403:
-                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
-                $result = json_decode($result->body, true);
-                break;
-            case 502:
-                error_log('Error 502 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
-                header('location:'.$_SERVER['PHP_SELF']);
-                break;
-            case 503:
-                error_log('Error 503 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+				$result = json_decode($result->body, true);
+				error_log('Error 477 - ' . print_r($result, true));
+				break;
+			case 429:
+				error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
+				exit("Error 429: Too Many Requests");
+				break;
+			case 403:
+				error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
+				$result = json_decode($result->body, true);
+				break;
+			case 502:
+				error_log('Error 502 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
+				header('location:'.$_SERVER['PHP_SELF']);
+				break;
+			case 503:
+				error_log('Error 503 - ' . print_r($result, true));
+				$result = json_decode($result->body, true);
 
-                if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
-                {
-                    header('location:'.$_SERVER['PHP_SELF']); 
-                }
-                break;
-            default:
-                error_log('Error '.$result->status_code.' - unknown error');
-                $result = json_decode($result->body, true);
-        }
+				if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
+				{
+					header('location:'.$_SERVER['PHP_SELF']); 
+				}
+				break;
+			default:
+				error_log('Error '.$result->status_code.' - unknown error');
+				$result = json_decode($result->body, true);
+		}
 
-        //important for account refresh
-        if($device_uid != '')
-        {
+		//important for account refresh
+		if($device_uid != '')
+		{
 			$result[0] = $result;
 			$result[1] = $device_uid;
-        }
+		}
 
         
-        /* var_dump($result); */
+		/* var_dump($result); */
         
-        return $result;
-    }
-    abstract function getPayload();
-    /**
-     * Gets Sign headers
-     * @return array headers
-     */
-    private function getSignHeaders()
-    {
+		return $result;
+	}
+	abstract function getPayload();
+	/**
+	 * Gets Sign headers
+	 * @return array headers
+	 */
+	private function getSignHeaders()
+	{
 			if($this->getAccessToken() == null) {
 				$payload_accessToken = "";
 			}
@@ -159,54 +159,54 @@ 
 			}
 			
 			
-        $headers = array(
-            "Connection" => "keep-alive",
-            "Accept-Encoding" => "gzip",
-            "Content-Type" => "application/json; charset=UTF-8",
-            "User-Agent" => self::USERAGENT
-        );
-        $timestamp = new DateTime();
-        $timestamp = $timestamp->format(DateTime::ATOM);
-        $timestamp = substr($timestamp, 0, -6);
-        $timestamp .= "Z";
-        $urlParts = parse_url($this->getFullUrl());
-        $url2 = "";
-        $req = [$this->getMethod(),
-            $urlParts['host'],
-            "443",
-            $urlParts['path'],
-            $payload_accessToken,
-            $timestamp,
-            $url2,
-            $this->payLoad];
-        $reqString = implode("%", $req);
-        $secret = self::SECRET;
-        $signature = hash_hmac('sha1', $reqString, $secret);
-        $signature = strtoupper($signature);
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
-        $headers['X-Timestamp'] = $timestamp;
-        $headers['X-Api-Version'] = '0.2';
-        return $headers;
-    }
-    private function getFullUrl()
-    {
-        return self::APIURL . $this->getApiEndPoint();
-    }
-    abstract function getApiEndPoint();
-    abstract function getMethod();
-    /**
-     * @return string
-     */
-    private function getAccessToken()
-    {
-        return $this->accessToken;
-    }
-    /**
-     * @param string $accessToken
-     */
-    public function setAccessToken($accessToken)
-    {
-        $this->accessToken = $accessToken;
-    }
+		$headers = array(
+			"Connection" => "keep-alive",
+			"Accept-Encoding" => "gzip",
+			"Content-Type" => "application/json; charset=UTF-8",
+			"User-Agent" => self::USERAGENT
+		);
+		$timestamp = new DateTime();
+		$timestamp = $timestamp->format(DateTime::ATOM);
+		$timestamp = substr($timestamp, 0, -6);
+		$timestamp .= "Z";
+		$urlParts = parse_url($this->getFullUrl());
+		$url2 = "";
+		$req = [$this->getMethod(),
+			$urlParts['host'],
+			"443",
+			$urlParts['path'],
+			$payload_accessToken,
+			$timestamp,
+			$url2,
+			$this->payLoad];
+		$reqString = implode("%", $req);
+		$secret = self::SECRET;
+		$signature = hash_hmac('sha1', $reqString, $secret);
+		$signature = strtoupper($signature);
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
+		$headers['X-Timestamp'] = $timestamp;
+		$headers['X-Api-Version'] = '0.2';
+		return $headers;
+	}
+	private function getFullUrl()
+	{
+		return self::APIURL . $this->getApiEndPoint();
+	}
+	abstract function getApiEndPoint();
+	abstract function getMethod();
+	/**
+	 * @return string
+	 */
+	private function getAccessToken()
+	{
+		return $this->accessToken;
+	}
+	/**
+	 * @param string $accessToken
+	 */
+	public function setAccessToken($accessToken)
+	{
+		$this->accessToken = $accessToken;
+	}
 }

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 = 'cYjTAwjdJyiuXAyrMhkCDiVZhshhLhotNotLiPVu';
@@ -20,7 +20,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'];
 		}
 				
@@ -29,7 +30,8 @@ 
         $header = $this->getSignHeaders();
         $url = $this->getFullUrl();
 
-        if ($this->getAccessToken()) {
+        if ($this->getAccessToken())
+        {
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
         }
         //Comment out to debug the Request:
@@ -52,7 +54,8 @@ 
             'proxy' => '186.103.169.165:8080',
         );*/
 
-        switch ($this->getMethod()) {
+        switch ($this->getMethod())
+        {
             case 'POST':
                 $result = Requests::post($url, $header, $this->payLoad);
                 break;
@@ -73,7 +76,8 @@ 
 
         http_response_code($result->status_code);
 
-        switch ($result->status_code) {
+        switch ($result->status_code)
+        {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -151,10 +155,12 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == null)
+			{
 				$payload_accessToken = "";
 			}
-			else {
+			else
+			{
 				$payload_accessToken = $this->getAccessToken();
 			}
 			

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

@@ -8,7 +8,7 @@ 
     const USERAGENT = 'Jodel/4.35.6 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
     const CLIENT_TYPE = 'android_4.35.6';
     
-    private $accessToken = null;
+    private $accessToken = NULL;
     private $payLoad;
     public $expects = '';
     public $version = 'v2';
@@ -75,18 +75,18 @@ 
 
         switch ($result->status_code) {
             case 200:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
                 break;
             case 204:
                 $result = 'Success';
                 http_response_code(200);
                 break;
             case 400:
-                $result = json_decode($result->body, true);
-                error_log('Error 400 - ' . print_r($result, true));
+                $result = json_decode($result->body, TRUE);
+                error_log('Error 400 - ' . print_r($result, TRUE));
                 break;
             case 401:
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
 
                 if(array_key_exists('error', $result) && $result['error'] == 'length')
                 {
@@ -94,33 +94,33 @@ 
                 }
                 else
                 {
-                    error_log('Error 401 - ' . print_r($result, true));
+                    error_log('Error 401 - ' . print_r($result, TRUE));
                 }
                 break;
             case 404:
-                error_log('Error 404 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+                error_log('Error 404 - ' . print_r($result, TRUE));
+                $result = json_decode($result->body, TRUE);
                 break;
 			case 477:
-                $result = json_decode($result->body, true);
-                error_log('Error 477 - ' . print_r($result, true));
+                $result = json_decode($result->body, TRUE);
+                error_log('Error 477 - ' . print_r($result, TRUE));
                 break;
             case 429:
-                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, true), true));
+                error_log('Error 429 - Too Many Requests' . print_r(json_decode($result->body, TRUE), TRUE));
             	exit("Error 429: Too Many Requests");
             	break;
             case 403:
-                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, true), true));
-                $result = json_decode($result->body, true);
+                error_log('Error 403 - Access denied:' . print_r(json_decode($result->body, TRUE), TRUE));
+                $result = json_decode($result->body, TRUE);
                 break;
             case 502:
-                error_log('Error 502 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+                error_log('Error 502 - ' . print_r($result, TRUE));
+                $result = json_decode($result->body, TRUE);
                 header('location:'.$_SERVER['PHP_SELF']);
                 break;
             case 503:
-                error_log('Error 503 - ' . print_r($result, true));
-                $result = json_decode($result->body, true);
+                error_log('Error 503 - ' . print_r($result, TRUE));
+                $result = json_decode($result->body, TRUE);
 
                 if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable')
                 {
@@ -129,7 +129,7 @@ 
                 break;
             default:
                 error_log('Error '.$result->status_code.' - unknown error');
-                $result = json_decode($result->body, true);
+                $result = json_decode($result->body, TRUE);
         }
 
         //important for account refresh
@@ -151,7 +151,7 @@ 
      */
     private function getSignHeaders()
     {
-			if($this->getAccessToken() == null) {
+			if($this->getAccessToken() == NULL) {
 				$payload_accessToken = "";
 			}
 			else {

php/DatabaseConnect.php

Spacing +2 added lines, -2 removed lines

@@ -17,10 +17,10 @@
 {
 	error_log('ER_TOO_MANY_USER_CONNECTIONS');
 	sleep(1);
-	header('location: '.$_SERVER['PHP_SELF']);
+	header('location: ' . $_SERVER['PHP_SELF']);
 }
 
-if ($db->connect_errno)
+if($db->connect_errno)
 {
 	error_log('Sorry, die Verbindung zu unserem 
         Server ist hops gegangen. Wegen '. $db -> connect_error);

Braces +4 added lines, -1 removed lines

@@ -13,9 +13,12 @@
 }
 $db = new DatabaseConnect();
 
-if($db->connect_errno == 1203)  // 1203 == ER_TOO_MANY_USER_CONNECTIONS (mysqld_error.h)
+if($db->connect_errno == 1203)
+{
+	// 1203 == ER_TOO_MANY_USER_CONNECTIONS (mysqld_error.h)
 {
 	error_log('ER_TOO_MANY_USER_CONNECTIONS');
+}
 	sleep(1);
 	header('location: '.$_SERVER['PHP_SELF']);
 }