View GitHub Repository jodel-web

Schedule Inspection
Subscribe
Completed
Pull Request — master (#16)
by
unknown
02:42
created
Status
Category
Toggle Patches
templates/nav-bottom.php 2 patches
Braces   +15 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -1,12 +1,24 @@
 
 block discarded – undo
1 1 
 <div id="sortJodelBy" class="row">
2 2 
 	<div class="col-3">
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>
3 
+		<a <?php if($view->view == 'combo')
4 
+{
5 
+	echo 'class="active"';
6 
+}
7 
+?> href="<?php echo $view->changeView('combo')->back()->toUrl();?>"><i class="fa fa-clock-o fa-3x"></i></a>
4 8 
 	</div>
5 9 
 	<div class="col-3">
6 
-		<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>
10 
+		<a <?php if($view->view == 'discussed')
11 
+{
12 
+	echo 'class="active"';
13 
+}
14 
+?> href="<?php echo $view->changeView('discussed')->back()->toUrl();?>"><i class="fa fa-commenting-o fa-3x"></i></a>
7 15 
 	</div>
8 16 
 	<div class="col-3">
9 
-		<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>
17 
+		<a <?php if($view->view == 'popular')
18 
+{
19 
+	echo 'class="active"';
20 
+}
21 
+?> href="<?php echo $view->changeView('popular')->back()->toUrl();?>"><i class="fa fa-angle-up fa-3x"></i></a>
10 22 
 	</div>
11 23 
 	<div class="col-3">
12 24 
 		<nav>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -1,16 +1,16 @@
 
 block discarded – undo
1 1 
 <div id="sortJodelBy" class="row">
2 2 
 	<div class="col-3">
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>
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>
4 4 
 	</div>
5 5 
 	<div class="col-3">
6 
-		<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>
6 
+		<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>
7 7 
 	</div>
8 8 
 	<div class="col-3">
9 
-		<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>
9 
+		<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>
10 10 
 	</div>
11 11 
 	<div class="col-3">
12 12 
 		<nav>
13 
-			<a href="<?php echo $baseUrl;?>about-us.php">about</a>
13 
+			<a href="<?php echo $baseUrl; ?>about-us.php">about</a>
14 14 
 		</nav>
15 15 
 	</div>
16 16 
 </div>
Please login to merge, or discard this patch.
templates/header.php 2 patches
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch 
@@ -1,52 +1,52 @@
 
 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 
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
15 
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
14 
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
15 
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
16 16
17 
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
18 
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
19 
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
20 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
21 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
22 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
23 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
24 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
25 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
26 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
27 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
28 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
29 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
30 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
31 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
32 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
33 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
34 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
35 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
36 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
37 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
38 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
39 
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png">
17 
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
18 
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
19 
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
20 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
21 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
22 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
23 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
24 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
25 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
26 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
27 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
28 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
29 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
30 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
31 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
32 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
33 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
34 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
35 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
36 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
37 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
38 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
39 
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png">
40 40 
 		<meta name="msapplication-TileColor" content="#5682a3">
41 41 
 		<meta name="msapplication-navbutton-color" content="#5682a3">
42 42 
 		<meta name="application-name" content="JodelBlue"/>
43 43 
 		<meta name="msapplication-tooltip" content="JodelBlue"/>
44 44 
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/>
45 
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png">
46 
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png">
47 
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png">
48 
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png">
49 
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png">
45 
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png">
46 
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png">
47 
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png">
48 
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png">
49 
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png">
50 50 
 	</head>
51 51
52 52 
 	<body>
Please login to merge, or discard this patch.
Braces   +5 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -74,7 +74,11 @@
 
 block discarded – undo
74 74
75 75 
 				<div id="location_mobile" class="hidden-sm-up">
76 76 
 					<form method="get">
77 
-						<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
77 
+						<input type="text" id="city_mobile" name="search" placeholder="<?php if(isset($newPositionStatus))
78 
+{
79 
+	echo $newPositionStatus;
80 
+}
81 
+?>" required>
78 82
79 83 
 						<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
80 84 
 					</form>
Please login to merge, or discard this patch.
about-us.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -47,6 +47,6 @@
 
 block discarded – undo
47 47 
 			</content>
48 48 
 		</article>
49 49 
 	</div>
50 
-	<?php include 'templates/nav-bottom.php';?>
50 
+	<?php include 'templates/nav-bottom.php'; ?>
51 51 
 </div>
52 
-<?php include 'templates/footer.php';?>
53 52 
\ No newline at end of file
53 
+<?php include 'templates/footer.php'; ?>
54 54 
\ No newline at end of file
Please login to merge, or discard this patch.
templates/footer.php 3 patches
Spacing   +4 added lines, -4 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
10 10 
 		<script>
11 11 
 			//BackButton
 
@@ -13,7 +13,7 @@  discard block
 
 block discarded – undo
13 13 
 			{
14 14 
 				window.history.back();
15 15 
 			}
16 
-		<?php if(isset($includeEmojiAndAjax)){ ?>
16 
+		<?php if(isset($includeEmojiAndAjax)) { ?>
17 17 
 			$(document).ready(function()
18 18 
 			{
19 19 
 				//Transform UTF-8 Emoji to img
 
@@ -49,7 +49,7 @@  discard block
 
 block discarded – undo
49 49 
 							if(!$("article[id='"+ hash +"']").length)
50 50 
 							{
51 51 
 								$.ajax({
52 
-									url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
52 
+									url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
53 53 
 									dataType: 'html',
54 54 
 									async: false,
55 55 
 									success: function(html) {
 
@@ -92,7 +92,7 @@  discard block
 
 block discarded – undo
92 92 
 						$('#loading').show();
93 93
94 94 
 						$.ajax({
95 
-							url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
95 
+							url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURI(hashtag),
96 96 
 							dataType: 'html',
97 97 
 							async: false,
98 98 
 							success: function(html) {
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -13,7 +13,9 @@  discard block
 
 block discarded – undo
13 13 
 			{
14 14 
 				window.history.back();
15 15 
 			}
16 
-		<?php if(isset($includeEmojiAndAjax)){ ?>
16 
+		<?php if(isset($includeEmojiAndAjax))
17 
+{
18 
+?>
17 19 
 			$(document).ready(function()
18 20 
 			{
19 21 
 				//Transform UTF-8 Emoji to img
 
@@ -29,7 +31,9 @@  discard block
 
 block discarded – undo
29 31 
 				    $('html,body').animate({scrollTop: aTag.offset().top-90},'slow');
30 32 
 				}
31 33
32 
-				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
34 
+				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
35 
+{
36 
+?>
33 37
34 38 
 				var win = $(window);
35 39 
 				var lastPostId = "<?php echo $view->lastPostId; ?>";
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -129,7 +129,7 @@
 
 block discarded – undo
129 129 
 		<?php
130 130 
 			if(is_file(realpath(__DIR__ . '/..') . '/piwik-script.html'))
131 131 
 			{
132 
-			    include(realpath(__DIR__ . '/..') . '/piwik-script.html');
132 
+				include(realpath(__DIR__ . '/..') . '/piwik-script.html');
133 133 
 			}
134 134 
 		?>
135 135
Please login to merge, or discard this patch.
error-pages/404.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -66,4 +66,4 @@
 
 block discarded – undo
66 66 
 		</article>
67 67 
 	</div>
68 68 
 </div>
69 
-<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php');?>
70 69 
\ No newline at end of file
70 
+<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php'); ?>
71 71 
\ No newline at end of file
Please login to merge, or discard this patch.
error-pages/410.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -66,4 +66,4 @@
 
 block discarded – undo
66 66 
 		</article>
67 67 
 	</div>
68 68 
 </div>
69 
-<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php');?>
70 69 
\ No newline at end of file
70 
+<?php include(realpath(__DIR__ . '/..') . '/templates/footer.php'); ?>
71 71 
\ No newline at end of file
Please login to merge, or discard this patch.
admin.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch 
@@ -4,12 +4,12 @@  discard block
 
 block discarded – undo
4 4
5 5 
 if((!isset($_GET['pw']) || $config['pw'] != $_GET['pw']) && !isUserAdmin())
6 6 
 {
7 
-	error_log($_SERVER['REMOTE_ADDR']  . ' used a wrong password on admin.php');
7 
+	error_log($_SERVER['REMOTE_ADDR'] . ' used a wrong password on admin.php');
8 8 
 	die();
9 9 
 }
10 
-else if (isset($_GET['pw']))
10 
+else if(isset($_GET['pw']))
11 11 
 {
12 
-	setcookie('JodelAdminPassword', $_GET['pw'], time()+60*60*24*365*10);
12 
+	setcookie('JodelAdminPassword', $_GET['pw'], time() + 60 * 60 * 24 * 365 * 10);
13 13 
 	error_log('admin password saved for [' . $_SERVER ['HTTP_USER_AGENT'] . ']');
14 14 
 }
15 15 
 
@@ -61,42 +61,42 @@  discard block
 
 block discarded – undo
61 61 
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client">
62 62
63 63 
 		<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">
64 
-				<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
65 
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
64 
+				<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
65 
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
66 66
67 
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
68 
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
69 
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
70 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
71 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
72 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
73 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
74 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
75 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
76 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
77 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
78 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
79 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
80 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
81 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
82 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
83 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
84 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
85 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
86 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
87 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
88 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
89 
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png">
67 
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
68 
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
69 
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
70 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
71 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
72 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
73 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
74 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
75 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
76 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
77 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
78 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
79 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
80 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
81 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
82 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
83 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
84 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
85 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
86 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
87 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
88 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
89 
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png">
90 90 
 		<meta name="msapplication-TileColor" content="#5682a3">
91 91 
 		<meta name="msapplication-navbutton-color" content="#5682a3">
92 92 
 		<meta name="application-name" content="JodelBlue"/>
93 93 
 		<meta name="msapplication-tooltip" content="JodelBlue"/>
94 94 
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/>
95 
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png">
96 
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png">
97 
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png">
98 
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png">
99 
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png">
95 
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png">
96 
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png">
97 
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png">
98 
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png">
99 
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png">
100 100 
 	</head>
101 101
102 102 
 	<body>
 
@@ -199,7 +199,7 @@  discard block
 
 block discarded – undo
199 199 
 			{
200 200 
 				$.ajax({
201 201 
 				  type: "POST",
202 
-				  url: "<?php echo $baseUrl;?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>",
202 
+				  url: "<?php echo $baseUrl; ?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>",
203 203 
 				  data: {"vote" : data["vote"],
204 204 
 						 "postId" : data["id"]},
205 205 
 				  success: function(result){
 
@@ -246,7 +246,7 @@  discard block
 
 block discarded – undo
246 246 
 				console.log(solution);
247 247 
 				$.ajax({
248 248 
 				  type: "POST",
249 
-				  url: "<?php echo $baseUrl;?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>&solution=" + solution + "&key="+key,
249 
+				  url: "<?php echo $baseUrl; ?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>&solution=" + solution + "&key="+key,
250 250 
 				  data: {"deviceUid" : deviceUid},
251 251 
 				  success: function(result){
252 252 
 					  var response = JSON.parse(result);
Please login to merge, or discard this patch.