mmainstreet / jodel-web

vote-ajax.php

Spacing +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 
 if(!isUserVoter() && !isUserAdmin())
 {
-	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();
 }
@@ -110,7 +110,7 @@ 
 			}
 		}
 
-	if (isset($captcha))
+	if(isset($captcha))
 	{
 		$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "deviceUid" => $deviceUid);
 	}

admin.php

Spacing +39 added lines, -39 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 . 'admin.php');
 	exit;
@@ -30,7 +30,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();
 }
 
@@ -50,7 +50,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);
@@ -98,42 +98,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>
@@ -184,9 +184,9 @@ 
 						<h2>Voting</h2>
 						<form>
 							<input placeholder="quantity" id="quantityDelay" type="number" name="quantity"><br>
-							<input placeholder="min interval" id="minDelay" value="<?php echo $config['minInterval'];?>" type="text" name="min"><br>
-							<input placeholder="max interval" id="maxDelay" value="<?php echo $config['maxInterval'];?>" type="text" name="max"><br>
-							<input placeholder="postId" id="postIdDelay" value="<?php if(isset($_GET['postId'])) echo $_GET['postId'];?>" type="text" name="postId"><br>
+							<input placeholder="min interval" id="minDelay" value="<?php echo $config['minInterval']; ?>" type="text" name="min"><br>
+							<input placeholder="max interval" id="maxDelay" value="<?php echo $config['maxInterval']; ?>" type="text" name="max"><br>
+							<input placeholder="postId" id="postIdDelay" value="<?php if(isset($_GET['postId'])) echo $_GET['postId']; ?>" type="text" name="postId"><br>
 							<button type="button" name="vote" value="up" class="half" onclick="voteWithAjax('up');">Upvote</button>
 							<button type="button" name="vote" value="down" class="half" onclick="voteWithAjax('down');">Downvote</button><br>
 						</form>
@@ -247,7 +247,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){
@@ -301,7 +301,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);

php/jodel-web.php

Spacing +9 added lines, -9 removed lines

@@ -49,7 +49,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);
 }
 
@@ -57,7 +57,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)
@@ -98,7 +98,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;
 	}
@@ -111,9 +111,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;
     }
@@ -135,8 +135,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
@@ -165,7 +165,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) === "#")
 		{
@@ -220,7 +220,7 @@ 
 	
 	if(isset($_GET['view']))
 	{
-		switch ($_GET['view']) {
+		switch($_GET['view']) {
 			case 'discussed':
 				$view = 'discussed';
 				break;

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

php/DatabaseConnect.php

Spacing +3 added lines, -3 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;
 }
@@ -54,7 +54,7 @@ 
 			 PRIMARY KEY  (`id`)
 			 ) DEFAULT CHARSET=utf8";
 
-$query3	 = "CREATE TABLE IF NOT EXISTS `users` (
+$query3 = "CREATE TABLE IF NOT EXISTS `users` (
 			 `id` int(11) unsigned NOT NULL auto_increment,
 			 `device_uid` varchar(255) NOT NULL,
 			 `rights` varchar(255) NOT NULL,

php/View.php

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