Completed
Push — master ( 3c0e9a...ccb03a )
by mains
02:54
created
php/DatabaseConnect.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,10 +17,10 @@
 block discarded – undo
17 17
 {
18 18
 	error_log('ER_TOO_MANY_USER_CONNECTIONS');
19 19
 	sleep(1);
20
-	header('location: '.$_SERVER['PHP_SELF']);
20
+	header('location: ' . $_SERVER['PHP_SELF']);
21 21
 }
22 22
 
23
-if ($db->connect_errno) {
23
+if($db->connect_errno) {
24 24
   echo 'Sorry, die Verbindung zu unserem 
25 25
         Server ist hops gegangen. Wegen '. $db -> connect_error;
26 26
 }
Please login to merge, or discard this patch.
php/JodelAccount.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
         {
36 36
             $this->refreshToken();
37 37
         }
38
-        $this->accessToken  = $this->getAccessToken();
38
+        $this->accessToken = $this->getAccessToken();
39 39
 
40 40
        /* if($this->isAccountVerified() != 1)
41 41
         {
@@ -106,11 +106,11 @@  discard block
 block discarded – undo
106 106
         }
107 107
 
108 108
         $db = new DatabaseConnect();
109
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
109
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
110 110
         
111 111
         $location = new Location();
112 112
         
113
-        if ($result->num_rows > 0)
113
+        if($result->num_rows > 0)
114 114
         {
115 115
             // output data of each row
116 116
             while($row = $result->fetch_assoc())
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
                     }
183 183
                     else
184 184
                     {
185
-                        user_log('User with JodelDeviceId:' . $this->deviceUid .  ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
185
+                        user_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name);
186 186
                     }
187 187
                 }
188 188
 
@@ -194,11 +194,11 @@  discard block
 block discarded – undo
194 194
     function getLocation()
195 195
     {
196 196
         $db = new DatabaseConnect();
197
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
197
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
198 198
         
199 199
         $location = new Location();
200 200
         
201
-        if ($result->num_rows > 0)
201
+        if($result->num_rows > 0)
202 202
         {
203 203
             // output data of each row
204 204
             while($row = $result->fetch_assoc())
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
         if(isset($_POST['color']))
322 322
         {
323 323
             $color = $_POST['color'];
324
-            switch ($color) {
324
+            switch($color) {
325 325
                 case '8ABDB0':
326 326
                     $color = '8ABDB0';
327 327
                     break;
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
         $db = new DatabaseConnect();  
390 390
         $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
391 391
 
392
-        if ($result->num_rows > 0)
392
+        if($result->num_rows > 0)
393 393
         {
394 394
             // output data of each row
395 395
             while($row = $result->fetch_assoc())
@@ -428,7 +428,7 @@  discard block
 block discarded – undo
428 428
                                     expiration_date='" . $expiration_date . "'
429 429
                                 WHERE device_uid='" . $device_uid . "'");
430 430
 
431
-        if($result === false){
431
+        if($result === false) {
432 432
                 error_log("Adding account failed: (" . $db->errno . ") " . $db->error);
433 433
         }   
434 434
     }
@@ -438,11 +438,11 @@  discard block
 block discarded – undo
438 438
     function getAccessToken()
439 439
     {
440 440
         $db = new DatabaseConnect();
441
-        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid  . "'");
441
+        $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'");
442 442
         
443 443
         $accessToken;
444 444
         
445
-        if ($result->num_rows > 0)
445
+        if($result->num_rows > 0)
446 446
         {
447 447
             // output data of each row
448 448
             while($row = $result->fetch_assoc())
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
         $result = $db->query("INSERT INTO votes (device_uid, postId, type)
509 509
                         VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')");
510 510
         
511
-        if($result === false){
511
+        if($result === false) {
512 512
                 $error = db_error();
513 513
                 echo $error;
514 514
                 echo "Adding Vote failed: (" . $result->errno . ") " . $result->error;
@@ -536,11 +536,11 @@  discard block
 block discarded – undo
536 536
         $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type,
537 537
                         expires_in, expiration_date, distinct_id, device_uid, name, lat, lng)
538 538
                         VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type .
539
-                        "','" .  $expires_in . "','" . $expiration_date . "','" . $distinct_id .
539
+                        "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id .
540 540
                         "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') ");
541 541
 
542 542
         $success = TRUE;
543
-        if($result === false){
543
+        if($result === false) {
544 544
                 $error = $db->error();
545 545
                 echo $error;
546 546
                 echo "Adding account failed: (" . $result->errno . ") " . $result->error;
Please login to merge, or discard this patch.
php/View.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -49,25 +49,25 @@  discard block
 block discarded – undo
49 49
         $timediff_inDays = (string)$timediff->format('%d');
50 50
         $timediff_inMonth = (string)$timediff->format('%m');
51 51
 
52
-        if($timediff_inMonth!=0)
52
+        if($timediff_inMonth != 0)
53 53
         {
54 54
                 $timediff = $timediff_inMonth . "m";
55 55
         }
56 56
         else
57 57
         {
58
-            if($timediff_inDays!=0)
58
+            if($timediff_inDays != 0)
59 59
             {
60 60
                 $timediff = $timediff_inDays . "d";
61 61
             }
62 62
             else
63 63
             {
64
-                if($timediff_inHours!=0)
64
+                if($timediff_inHours != 0)
65 65
                 {
66 66
                     $timediff = $timediff_inHours . "h";
67 67
                 }
68 68
                 else
69 69
                 {
70
-                    if($timediff_inMinutes!=0)
70
+                    if($timediff_inMinutes != 0)
71 71
                     {
72 72
                         $timediff = $timediff_inMinutes . "m";
73 73
                     }
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
 
83 83
         ?>
84
-        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color'];?>;">
84
+        <article id ="postId-<?php echo $post['post_id']; ?>" class="jodel" style="background-color: #<?php echo $post['color']; ?>;">
85 85
             <content>
86 86
                 <?php 
87 87
                 if(isset($post['image_url']))
@@ -96,12 +96,12 @@  discard block
 block discarded – undo
96 96
                 ?>
97 97
             </content>
98 98
             <aside>                    
99
-                <button onclick="vote('<?php echo $post['post_id'];?>', 'up', this)">
99
+                <button onclick="vote('<?php echo $post['post_id']; ?>', 'up', this)">
100 100
                     <i class="fa fa-angle-up fa-3x"></i>
101 101
                 </button>    
102
-                <br><span><?php echo $post["vote_count"];?></span><br>
102
+                <br><span><?php echo $post["vote_count"]; ?></span><br>
103 103
 
104
-                <button onclick="vote('<?php echo $post['post_id'];?>', 'down', this)">
104
+                <button onclick="vote('<?php echo $post['post_id']; ?>', 'down', this)">
105 105
                     <i class="fa fa-angle-down fa-3x"></i>
106 106
                 </button>
107 107
             </aside>
@@ -112,14 +112,14 @@  discard block
 block discarded – undo
112 112
                         <span class="time">
113 113
                             <span class="tip" data-tooltip="Time">
114 114
                                 <i class="fa fa-clock-o"></i>
115
-                                <?php echo $timediff;?>
116
-                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s');?></span>
115
+                                <?php echo $timediff; ?>
116
+                                <span class="tiptext"><?php echo $d->format('Y-m-d H:i:s'); ?></span>
117 117
                             </span> 
118 118
                         </span>
119 119
 						<?php if(!$this->isDetailedView) {?>
120 120
                         <span class="comments">
121 121
                             <span data-tooltip="Comments">
122
-                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl();?>">
122
+                                <a href="<?php echo $this->changePostId($post['post_id'])->toUrl(); ?>">
123 123
                                     <i class="fa fa-commenting-o"></i>
124 124
                                     <?php if(array_key_exists("child_count", $post))
125 125
                                     {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
                         </span>
133 133
 						<?php
134 134
 						}															  
135
-						if (isUserAdmin())
135
+						if(isUserAdmin())
136 136
 						{
137 137
 						?>
138 138
 						<span class="voting">
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
                                         {
163 163
                                             ?>
164 164
                                             <span data-tooltip="Author">
165
-                                                <i class="fa fa-user-o"></i> #<?php echo $post['user_handle'];?> |
165
+                                                <i class="fa fa-user-o"></i> #<?php echo $post['user_handle']; ?> |
166 166
                                             </span>
167 167
                                             <?php
168 168
                                         }
@@ -172,8 +172,8 @@  discard block
 block discarded – undo
172 172
 
173 173
                             <span class="tip" data-tooltip="Distance">
174 174
                                 <i class="fa fa-map-marker"></i>
175
-                                <?php echo $post['distance'];?> km
176
-                                <span class="tiptext"><?php echo $post['location']['name'];?></span>
175
+                                <?php echo $post['distance']; ?> km
176
+                                <span class="tiptext"><?php echo $post['location']['name']; ?></span>
177 177
                             </span>
178 178
                         </span>
179 179
                     
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
 		if($post != '' && array_key_exists('message', $post) && $post['message'] != '' && $this->isDetailedView)
214 214
 		{
215
-			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) .  ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
215
+			$description = 'On JodelBlue in ' . htmlspecialchars($this->city) . ' with ' . htmlspecialchars($post['vote_count']) . ' Upvotes: ' . substr(htmlspecialchars($post['message']), 0, 130);
216 216
 		}
217 217
 
218 218
 		return $description;
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
         {
310 310
             return $data['recent'];
311 311
         }
312
-        else if(array_key_exists('posts', $data)&& array_key_exists(0, $data['posts']))
312
+        else if(array_key_exists('posts', $data) && array_key_exists(0, $data['posts']))
313 313
         {
314 314
             return $data['posts'];
315 315
         }
Please login to merge, or discard this patch.
templates/footer.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 			  crossorigin="anonymous"></script>
6 6
 	    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.0/js/tether.min.js" integrity="sha384-DztdAPBWPRXSA/3eYEEUWrWCy7G5KFbe8fFjk5JAIxUYHKkDx6Qin1DkWx51bBrb" crossorigin="anonymous"></script>
7 7
 	    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>
8
-	    <script src="<?php echo $baseUrl;?>js/jQueryEmoji.js"></script>
8
+	    <script src="<?php echo $baseUrl; ?>js/jQueryEmoji.js"></script>
9 9
 	    <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>
10 10
 
11 11
 		<script>
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 			console.log(solution);
38 38
 			$.ajax({
39 39
 			  type: "POST",
40
-			  url: "<?php echo $baseUrl;?>vote-ajax.php?solution=" + solution + "&key="+key,
40
+			  url: "<?php echo $baseUrl; ?>vote-ajax.php?solution=" + solution + "&key="+key,
41 41
 			  data: {"deviceUid" : deviceUid},
42 42
 			  success: function(result){
43 43
 				  	var response = JSON.parse(result);
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
 			{
62 62
 				window.history.back();
63 63
 			}
64
-		<?php if(isset($includeEmojiAndAjax)){ ?>
64
+		<?php if(isset($includeEmojiAndAjax)) { ?>
65 65
 
66 66
 			function vote(postId, vote, obj)
67 67
 			{
68 68
 				$.ajax({
69
-					url: '<?php echo $baseUrl;?>vote-ajax.php?postId=' + postId + '&vote=' + vote,
69
+					url: '<?php echo $baseUrl; ?>vote-ajax.php?postId=' + postId + '&vote=' + vote,
70 70
 					dataType: 'json',
71 71
 					async: true,
72 72
 					success: function(json)
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 				function getMorePosts(lastPostId, view, hashtag, old_lastPostId)
121 121
 				{
122 122
 					$.ajax({
123
-						url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag),
123
+						url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag),
124 124
 						dataType: 'html',
125 125
 						async: false,
126 126
 						success: function(html) {
Please login to merge, or discard this patch.
templates/captcha.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@  discard block
 block discarded – undo
5 5
 ?>
6 6
 <div id="captchaWrapper">
7 7
 	<p>Check all images with Coons on it (Coons look like <img style="height: 1.0em; width: unset;" src="img/coon.png">).</p>
8
-	<img src="<?php echo $captcha['image_url'];?>">
8
+	<img src="<?php echo $captcha['image_url']; ?>">
9 9
 	<div class='captchaWrapper'>
10 10
 		<input id='box_0' type='checkbox'>
11 11
 		<input id='box_1' type='checkbox'>
@@ -17,5 +17,5 @@  discard block
 block discarded – undo
17 17
 		<input id='box_7' type='checkbox'>
18 18
 		<input id='box_8' type='checkbox'>
19 19
 	</div>
20
-	<button onClick="verifyAccount('<?php echo $captcha['key'];?>','<?php echo $jodelAccountForView->deviceUid?>')">Verify</button>
20
+	<button onClick="verifyAccount('<?php echo $captcha['key']; ?>','<?php echo $jodelAccountForView->deviceUid?>')">Verify</button>
21 21
 </div>
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
templates/header.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,53 +1,53 @@
 block discarded – undo
1 1
 <!DOCTYPE html>
2 2
 <html lang="en">
3 3
 	<head>
4
-		<title><?php echo $title;?></title>
4
+		<title><?php echo $title; ?></title>
5 5
 		
6 6
 		<meta charset="utf-8">
7 7
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
8 8
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
9 9
 		
10
-		<meta name="description" content="<?php echo $description;?>">
10
+		<meta name="description" content="<?php echo $description; ?>">
11 11
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
12 12
 		
13 13
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
14 14
 		<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ekko-lightbox/5.1.1/ekko-lightbox.min.css" integrity="sha256-8aNQFtmxcOMVoOhLD4mrHqaKC2Ui++LmlQsoKTqxwIE=" crossorigin="anonymous" />
15
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
16
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
15
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
16
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
17 17
 		
18
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
19
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
20
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
21
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
22
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
23
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
24
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
25
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
26
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
27
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
28
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
29
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
30
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
31
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
32
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
33
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
34
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
35
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
36
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
37
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
38
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
39
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
40
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
18
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
19
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
20
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
21
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
22
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
23
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
24
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
25
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
26
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
27
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
28
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
29
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
30
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
31
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
32
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
33
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
34
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
35
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
36
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
37
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
38
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
39
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
40
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
41 41
 		<meta name="msapplication-TileColor" content="#5682a3"> 
42 42
 		<meta name="msapplication-navbutton-color" content="#5682a3"> 
43 43
 		<meta name="application-name" content="JodelBlue"/> 
44 44
 		<meta name="msapplication-tooltip" content="JodelBlue"/> 
45 45
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/> 
46
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png"> 
47
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png"> 
48
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png"> 
49
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png"> 
50
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png"> 
46
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png"> 
47
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png"> 
48
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png"> 
49
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png"> 
50
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png"> 
51 51
 	</head>
52 52
 
53 53
 	<body>
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 				</article>
105 105
 			
106 106
 				<aside class="topSidebar col-sm-4 sidebar-outer">
107
-					<div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile');?>">
107
+					<div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile'); ?>">
108 108
 						<article>
109 109
 							<div>
110 110
 								<h2>Position / Hashtag</h2>
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 									if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
142 142
 									<h2>Comment on Jodel</h2>
143 143
 									<form method="POST">				
144
-											<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
144
+											<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']); ?>" />
145 145
 											<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> 
146 146
 										<br />
147 147
 										<input type="submit" value="SEND" /> 
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 					</div>
204 204
 				</aside>
205 205
 			</div>
206
-			<?php include 'templates/nav-bottom.php';?>
206
+			<?php include 'templates/nav-bottom.php'; ?>
207 207
 		</div>
208 208
 		<?php
209 209
 			$includeEmojiAndAjax = TRUE;
Please login to merge, or discard this patch.
php/Requests/AbstractRequest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
         $header = $this->getSignHeaders();
30 30
         $url = $this->getFullUrl();
31 31
 
32
-        if ($this->getAccessToken()) {
32
+        if($this->getAccessToken()) {
33 33
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
34 34
         }
35 35
         //Comment out to debug the Request:
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             'proxy' => '186.103.169.165:8080',
53 53
         );*/
54 54
 
55
-        switch ($this->getMethod()) {
55
+        switch($this->getMethod()) {
56 56
             case 'POST':
57 57
                 $result = Requests::post($url, $header, $this->payLoad);
58 58
                 break;
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
                 $result = Requests::put($url, $header, $this->payLoad);
71 71
                 break;
72 72
         }
73
-        switch ($result->status_code) {
73
+        switch($result->status_code) {
74 74
             case 200:
75 75
                 $result = json_decode($result->body, true);
76 76
                 break;
@@ -111,11 +111,11 @@  discard block
 block discarded – undo
111 111
 
112 112
                 if(array_key_exists('error', $result) && $result['error'] == 'Service Unavailable"')
113 113
                 {
114
-                    header('location:'.$_SERVER['PHP_SELF']); 
114
+                    header('location:' . $_SERVER['PHP_SELF']); 
115 115
                 }
116 116
                 break;
117 117
             default:
118
-                error_log('Error '.$result->status_code.' - unknown error');
118
+                error_log('Error ' . $result->status_code . ' - unknown error');
119 119
                 $result = json_decode($result->body, true);
120 120
         }
121 121
 
Please login to merge, or discard this patch.
vote-ajax.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,8 +20,8 @@  discard block
 block discarded – undo
20 20
 
21 21
 if((!isset($_GET['pw']) || $config['pw'] != $_GET['pw']) && !isUserAdmin())
22 22
 {
23
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php');
24
-	$response = array("message" => $_SERVER['REMOTE_ADDR']  . ' used a wrong password on vote-ajax.php',"success" => false);
23
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php');
24
+	$response = array("message" => $_SERVER['REMOTE_ADDR'] . ' used a wrong password on vote-ajax.php', "success" => false);
25 25
 	echo json_encode($response);
26 26
 	die();
27 27
 }
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		}
112 112
 	}
113 113
 
114
-if (isset($captcha))
114
+if(isset($captcha))
115 115
 {
116 116
 	$response = array("success" => $success, "message" => $message, "captcha" => $captcha, "deviceUid" => $deviceUid);
117 117
 }
Please login to merge, or discard this patch.