mmainstreet / jodel-web

php/jodel-web.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,7 @@ 
 
 function user_log($msg)
 {
-    $log  = $msg . PHP_EOL;
+    $log = $msg . PHP_EOL;
     file_put_contents(realpath(__DIR__ . '/..') . '/logs/user_log-' . date("j.n.Y") . '.txt', $log, FILE_APPEND);
 }
 
@@ -47,7 +47,7 @@ 
 {
     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)
@@ -63,7 +63,7 @@ 
 }
 function isUserAdmin() {
 	global $config;
-	if (isset($_COOKIE['JodelAdminPassword']) && configPropertyExists($config, 'pw') && $config['pw'] == $_COOKIE['JodelAdminPassword'])
+	if(isset($_COOKIE['JodelAdminPassword']) && configPropertyExists($config, 'pw') && $config['pw'] == $_COOKIE['JodelAdminPassword'])
 	{
 		return TRUE;
 	}
@@ -76,9 +76,9 @@ 
 function isDeviceUidInDatabase($deviceUid)
 {
     $db = new DatabaseConnect();  
-    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid  . "'");
+    $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'");
 
-    if ($result->num_rows > 0)
+    if($result->num_rows > 0)
     {
         return TRUE;
     }
@@ -100,8 +100,8 @@ 
 		if(!isset($_COOKIE['JodelDeviceId']) || !isDeviceUidInDatabase($_COOKIE['JodelDeviceId']))
 		{
 			$jodelAccountForView = new JodelAccount();
-			setcookie('JodelDeviceId', $jodelAccountForView->deviceUid, time()+60*60*24*365*10);
-			user_log('Created account with JodelDeviceId:' . $jodelAccountForView->deviceUid .  ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
+			setcookie('JodelDeviceId', $jodelAccountForView->deviceUid, time() + 60 * 60 * 24 * 365 * 10);
+			user_log('Created account with JodelDeviceId:' . $jodelAccountForView->deviceUid . ' for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
 			
 		}
 		else
@@ -130,7 +130,7 @@ 
 	if(isset($_GET['search']))
 	{
 
-		user_log('User with JodelDeviceId:' . $jodelAccountForView->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] searched for ' . $_GET['search']);
+		user_log('User with JodelDeviceId:' . $jodelAccountForView->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] searched for ' . $_GET['search']);
 
 		if(substr($_GET['search'], 0, 1) === "#")
 		{
@@ -185,7 +185,7 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'discussed':
 				$view = 'discussed';
 				break;

templates/nav-bottom.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <div id="sortJodelBy" class="row">
 	<div class="col-3">
-		<a <?php if($view->view == 'combo')echo 'class="active"';?> href="<?php echo $view->changeView('combo')->back()->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
+		<a <?php if($view->view == 'combo')echo 'class="active"'; ?> href="<?php echo $view->changeView('combo')->back()->toUrl(); ?>"><i class="fa fa-clock-o fa-3x"></i></a>
 	</div>
 	<div class="col-3">
-		<a <?php if($view->view == 'discussed') echo 'class="active"';?> href="<?php echo $view->changeView('discussed')->back()->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
+		<a <?php if($view->view == 'discussed') echo 'class="active"'; ?> href="<?php echo $view->changeView('discussed')->back()->toUrl(); ?>"><i class="fa fa-commenting-o fa-3x"></i></a>
 	</div>
 	<div class="col-3">
-		<a <?php if($view->view == 'popular') echo 'class="active"';?> href="<?php echo $view->changeView('popular')->back()->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
+		<a <?php if($view->view == 'popular') echo 'class="active"'; ?> href="<?php echo $view->changeView('popular')->back()->toUrl(); ?>"><i class="fa fa-angle-up fa-3x"></i></a>
 	</div>
 	<div class="col-3">
 		<nav>
-			<a href="<?php echo $baseUrl;?>about-us.php">about</a>
+			<a href="<?php echo $baseUrl; ?>about-us.php">about</a>
 		</nav>
 	</div>
 </div>

index.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,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>
@@ -115,7 +115,7 @@ 
 								<?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']);?>" />
+										<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" /> 
@@ -157,7 +157,7 @@ 
 					</div>
 				</aside>
 			</div>
-			<?php include 'templates/nav-bottom.php';?>
+			<?php include 'templates/nav-bottom.php'; ?>
 		</div>
 		<?php
 			$includeEmojiAndAjax = TRUE;

templates/footer.php

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,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>
 			//BackButton
@@ -13,7 +13,7 @@ 
 			{
 				window.history.back();
 			}
-		<?php if(isset($includeEmojiAndAjax)){ ?>
+		<?php if(isset($includeEmojiAndAjax)) { ?>
 			$(document).ready(function()
 			{
 				//Transform UTF-8 Emoji to img
@@ -45,7 +45,7 @@ 
 				function getMorePosts(lastPostId, view, hashtag, old_lastPostId)
 				{
 					$.ajax({
-						url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag),
+						url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag),
 						dataType: 'html',
 						async: false,
 						success: function(html) {

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) {
   echo 'Sorry, die Verbindung zu unserem 
         Server ist hops gegangen. Wegen '. $db -> connect_error;
 }

php/JodelAccount.php

Spacing +14 added lines, -14 removed lines

@@ -35,7 +35,7 @@ 
         {
             $this->refreshToken();
         }
-        $this->accessToken  = $this->getAccessToken();
+        $this->accessToken = $this->getAccessToken();
 
        /* if($this->isAccountVerified() != 1)
         {
@@ -106,11 +106,11 @@ 
         }
 
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $location = new Location();
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -182,7 +182,7 @@ 
                     }
                     else
                     {
-                        user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
+                        user_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
                     }
                 }
 
@@ -194,11 +194,11 @@ 
     function getLocation()
     {
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $location = new Location();
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -321,7 +321,7 @@ 
         if(isset($_POST['color']))
         {
             $color = $_POST['color'];
-            switch ($color) {
+            switch($color) {
                 case '8ABDB0':
                     $color = '8ABDB0';
                     break;
@@ -389,7 +389,7 @@ 
         $db = new DatabaseConnect();  
         $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
 
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -428,7 +428,7 @@ 
                                     expiration_date='" . $expiration_date . "'
                                 WHERE device_uid='" . $device_uid . "'");
 
-        if($result === false){
+        if($result === false) {
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
         }   
     }
@@ -438,11 +438,11 @@ 
     function getAccessToken()
     {
         $db = new DatabaseConnect();
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
         
         $accessToken;
         
-        if ($result->num_rows > 0)
+        if($result->num_rows > 0)
         {
             // output data of each row
             while($row = $result->fetch_assoc())
@@ -508,7 +508,7 @@ 
         $result = $db->query("INSERT INTO votes (device_uid, postId, type)
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
         
-        if($result === false){
+        if($result === false) {
                 $error = db_error();
                 echo $error;
                 echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -536,11 +536,11 @@ 
         $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
                         expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
                         VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
-                        "','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
+                        "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
                         "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
 
         $success = TRUE;
-        if($result === false){
+        if($result === false) {
                 $error = $db->error();
                 echo $error;
                 echo "Adding account failed: (" . $result->errno . ") " . $result->error;

php/Requests/AbstractRequest.php

Spacing +5 added lines, -5 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;
@@ -70,7 +70,7 @@ 
                 $result = Requests::put($url, $header, $this->payLoad);
                 break;
         }
-        switch ($result->status_code) {
+        switch($result->status_code) {
             case 200:
                 $result = json_decode($result->body, true);
                 break;
@@ -107,11 +107,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.' - Unauthorized');
+                error_log('Error ' . $result->status_code . ' - Unauthorized');
                 $result = json_decode($result->body, true);
         }
 

php/View.php

Spacing +19 added lines, -19 removed lines

@@ -49,25 +49,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";
                     }
@@ -81,7 +81,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']))
@@ -99,24 +99,24 @@ 
                 <?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">
+                        <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
                     {?>
-                        <a href="index.php?vote=up&postId=<?php echo $post['post_id'];?>" rel="nofollow">
+                        <a href="index.php?vote=up&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-up fa-3x"></i>
                         </a>    
                             <br />
-                        <?php echo $post["vote_count"];?><br />
+                        <?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">
+                        <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
                     {?>
-                        <a href="index.php?vote=down&postId=<?php echo $post['post_id'];?>" rel="nofollow">
+                        <a href="index.php?vote=down&postId=<?php echo $post['post_id']; ?>" rel="nofollow">
               <?php } ?>
                             <i class="fa fa-angle-down fa-3x"></i>
                         </a>
@@ -128,14 +128,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)) {
                                                 echo $post["child_count"];
@@ -147,7 +147,7 @@ 
                         </span>
 						<?php
 						}															  
-						if (isUserAdmin())
+						if(isUserAdmin())
 						{
 						?>
 						<span class="voting">
@@ -177,7 +177,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
                                         }
@@ -187,8 +187,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>
                     
@@ -227,7 +227,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;
@@ -324,7 +324,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'];
         }