@@ -1,52 +1,52 @@ |
||
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> |
@@ -74,7 +74,11 @@ |
||
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="" /> |
80 | 84 | </form> |
@@ -47,6 +47,6 @@ |
||
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 |
@@ -129,7 +129,7 @@ |
||
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 |
@@ -5,7 +5,7 @@ discard block |
||
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 |
||
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 |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | function getMorePosts(lastPostId, view, hashtag, old_lastPostId) |
46 | 46 | { |
47 | 47 | $.ajax({ |
48 | - url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag), |
|
48 | + url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view + '&hashtag=' + encodeURIComponent(hashtag), |
|
49 | 49 | dataType: 'html', |
50 | 50 | async: false, |
51 | 51 | success: function(html) { |
@@ -13,7 +13,9 @@ discard block |
||
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 |
@@ -72,7 +74,9 @@ discard block |
||
72 | 74 | return {"lastPostId":lastPostId, "old_lastPostId":old_lastPostId}; |
73 | 75 | } |
74 | 76 | |
75 | - <?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?> |
|
77 | + <?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) |
|
78 | +{ |
|
79 | +?> |
|
76 | 80 | |
77 | 81 | if(window.location.hash) |
78 | 82 | { |
@@ -66,4 +66,4 @@ |
||
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 |
@@ -66,4 +66,4 @@ |
||
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 |
@@ -4,12 +4,12 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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); |
@@ -49,7 +49,7 @@ |
||
49 | 49 | } |
50 | 50 | if(!isset($posts[0])) |
51 | 51 | { |
52 | - error_log('Fehler: ' . print_r($posts, true) . print_r($posts['recent'], true) . print_r($posts['posts'], true)); |
|
52 | + error_log('Fehler: ' . print_r($posts, TRUE) . print_r($posts['recent'], TRUE) . print_r($posts['posts'], TRUE)); |
|
53 | 53 | $title = $view->getTitle(); |
54 | 54 | $description = $view->getMetaDescription(); |
55 | 55 | } |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | </article> |
92 | 92 | |
93 | 93 | <aside class="topSidebar col-sm-4 sidebar-outer"> |
94 | - <div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile');?>"> |
|
94 | + <div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile'); ?>"> |
|
95 | 95 | <article> |
96 | 96 | <div> |
97 | 97 | <h2>Position / Hashtag</h2> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | <?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?> |
116 | 116 | <h2>Comment on Jodel</h2> |
117 | 117 | <form method="POST"> |
118 | - <input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" /> |
|
118 | + <input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']); ?>" /> |
|
119 | 119 | <textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> |
120 | 120 | <br /> |
121 | 121 | <input type="submit" value="SEND" /> |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | </div> |
158 | 158 | </aside> |
159 | 159 | </div> |
160 | - <?php include 'templates/nav-bottom.php';?> |
|
160 | + <?php include 'templates/nav-bottom.php'; ?> |
|
161 | 161 | </div> |
162 | 162 | <?php |
163 | 163 | $includeEmojiAndAjax = TRUE; |
@@ -20,7 +20,8 @@ discard block |
||
20 | 20 | |
21 | 21 | $posts[0] = $data; |
22 | 22 | |
23 | - if(array_key_exists('children', $data)) { |
|
23 | + if(array_key_exists('children', $data)) |
|
24 | + { |
|
24 | 25 | foreach($data['children'] as $key => $child) |
25 | 26 | { |
26 | 27 | |
@@ -83,7 +84,9 @@ discard block |
||
83 | 84 | } ?> |
84 | 85 | </content> |
85 | 86 | |
86 | - <?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?> |
|
87 | + <?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) |
|
88 | +{ |
|
89 | +?> |
|
87 | 90 | <p id="loading"> |
88 | 91 | Loading… |
89 | 92 | </p> |
@@ -91,12 +94,20 @@ discard block |
||
91 | 94 | </article> |
92 | 95 | |
93 | 96 | <aside class="topSidebar col-sm-4 sidebar-outer"> |
94 | - <div class="fixed<?php if(!$view->isDetailedView) echo(' hide-mobile');?>"> |
|
97 | + <div class="fixed<?php if(!$view->isDetailedView) |
|
98 | +{ |
|
99 | + echo(' hide-mobile'); |
|
100 | +} |
|
101 | +?>"> |
|
95 | 102 | <article> |
96 | 103 | <div> |
97 | 104 | <h2>Position / Hashtag</h2> |
98 | 105 | <form method="get"> |
99 | - <input type="text" id="city" name="search" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required> |
|
106 | + <input type="text" id="city" name="search" placeholder="<?php if(isset($newPositionStatus)) |
|
107 | +{ |
|
108 | + echo $newPositionStatus; |
|
109 | +} |
|
110 | +?>" required> |
|
100 | 111 | <label>try: #jhj</label><br> |
101 | 112 | <input type="submit" value="Set Location" /> |
102 | 113 | </form> |
@@ -112,7 +123,9 @@ discard block |
||
112 | 123 | |
113 | 124 | <article> |
114 | 125 | <div> |
115 | - <?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?> |
|
126 | + <?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) |
|
127 | +{ |
|
128 | +?> |
|
116 | 129 | <h2>Comment on Jodel</h2> |
117 | 130 | <form method="POST"> |
118 | 131 | <input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" /> |
@@ -120,7 +133,10 @@ discard block |
||
120 | 133 | <br /> |
121 | 134 | <input type="submit" value="SEND" /> |
122 | 135 | </form> |
123 | - <?php } else { ?> |
|
136 | + <?php } |
|
137 | +else |
|
138 | +{ |
|
139 | +?> |
|
124 | 140 | <h2>New Jodel</h2> |
125 | 141 | <form method="POST"> |
126 | 142 | <textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> |
@@ -13,17 +13,17 @@ |
||
13 | 13 | public $varsToDump; |
14 | 14 | |
15 | 15 | function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set') |
16 | - { |
|
17 | - $this->view = $view; |
|
18 | - $this->actions = $actions; |
|
19 | - $this->accountId = $accountId; |
|
20 | - $this->isVerified = $isVerified; |
|
21 | - $this->isTokenFresh = $isTokenFresh; |
|
22 | - $this->page = $page; |
|
23 | - $this->referrer = $referrer; |
|
24 | - $this->msg = $msg; |
|
25 | - $this->varsToDump = $varsToDump; |
|
26 | - } |
|
16 | + { |
|
17 | + $this->view = $view; |
|
18 | + $this->actions = $actions; |
|
19 | + $this->accountId = $accountId; |
|
20 | + $this->isVerified = $isVerified; |
|
21 | + $this->isTokenFresh = $isTokenFresh; |
|
22 | + $this->page = $page; |
|
23 | + $this->referrer = $referrer; |
|
24 | + $this->msg = $msg; |
|
25 | + $this->varsToDump = $varsToDump; |
|
26 | + } |
|
27 | 27 | |
28 | 28 | function writeErrorToLog() |
29 | 29 | { |
@@ -13,7 +13,7 @@ |
||
13 | 13 | public $varsToDump; |
14 | 14 | |
15 | 15 | function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set') |
16 | - { |
|
16 | + { |
|
17 | 17 | $this->view = $view; |
18 | 18 | $this->actions = $actions; |
19 | 19 | $this->accountId = $accountId; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | error_log("=============================== ERROR ================================"); |
31 | 31 | error_log("msg: " . $this->msg); |
32 | - error_log("view: " . print_r($this->view, true)); |
|
32 | + error_log("view: " . print_r($this->view, TRUE)); |
|
33 | 33 | error_log("actions: " . $this->actionsToString()); |
34 | 34 | error_log("accountId: " . $this->accountId); |
35 | 35 | error_log("isVerified: " . $this->isVerified); |