View GitHub Repository jodel-web

Schedule Inspection
Subscribe
Completed
Push — master ( 1ba5c4...027077 )
by mains
03:02
created
Status
Category
Toggle Patches
index.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -300,7 +300,7 @@
 
 block discarded – undo
300 300 
 		<?php
301 301 
 			if(is_file($baseUrl . 'piwik-script.html'))
302 302 
 			{
303 
-			    require_once($baseUrl . 'piwik-script.html');
303 
+				require_once($baseUrl . 'piwik-script.html');
304 304 
 			}
305 305 
 		?>
306 306
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch 
@@ -1,53 +1,53 @@  discard block
 
 block discarded – undo
1 
-<?php include 'php/jodel-web.php';?>
1 
+<?php include 'php/jodel-web.php'; ?>
2 2 
 <!DOCTYPE html>
3 3 
 <html lang="en">
4 4 
 	<head>
5 
-		<title><?php echo $viewTest->getTitle($posts[0], $view, $isDetailedView);?></title>
5 
+		<title><?php echo $viewTest->getTitle($posts[0], $view, $isDetailedView); ?></title>
6 6
7 7 
 		<meta charset="utf-8">
8 8 
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
9 9 
 		<meta http-equiv="x-ua-compatible" content="ie=edge">
10 10
11 
-		<meta name="description" content="<?php echo $viewTest->getMetaDescription($posts[0], $view, $isDetailedView);?>">
11 
+		<meta name="description" content="<?php echo $viewTest->getMetaDescription($posts[0], $view, $isDetailedView); ?>">
12 12 
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client, web-app, browser, app">
13 13
14 14 
 		<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">
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>
 
@@ -90,7 +90,7 @@  discard block
 
 block discarded – undo
90 90
91 91 
 					<content id="posts">
92 92 
 						<?php
93 
-							for($i = 0; $i<$loops; $i++)
93 
+							for($i = 0; $i < $loops; $i++)
94 94 
 							{
95 95 
 								if(array_key_exists($i, $posts) && array_key_exists('post_id', $posts[$i]) && isset($posts[$i]['post_id']))
96 96 
 								{
 
@@ -134,7 +134,7 @@  discard block
 
 block discarded – undo
134 134 
 								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
135 135 
 								<h2>Comment on Jodel</h2>
136 136 
 								<form method="POST">
137 
-										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
137 
+										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']); ?>" />
138 138 
 										<textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea>
139 139 
 									<br />
140 140 
 									<input type="submit" value="SEND" /> 
@@ -167,14 +167,14 @@  discard block
 
 block discarded – undo
167 167 
 					</div>
168 168 
 				</aside>
169 169 
 			</div>
170 
-			<?php include './template/nav-bottom.php';?>
170 
+			<?php include './template/nav-bottom.php'; ?>
171 171
172 172
173 173 
 		<!-- jQuery, Tether, Bootstrap JS and own-->
174 174 
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7" crossorigin="anonymous"></script>
175 175 
     	<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js" integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8" crossorigin="anonymous"></script>
176 176 
     	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js" integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK" crossorigin="anonymous"></script>
177 
-    	<script src="<?php echo $baseUrl;?>js/jQueryEmoji.js"></script>
177 
+    	<script src="<?php echo $baseUrl; ?>js/jQueryEmoji.js"></script>
178 178
179 179 
 		<script>
180 180 
 			//BackButton
 
@@ -221,7 +221,7 @@  discard block
 
 block discarded – undo
221 221 
 							if(!$("article[id='"+ hash +"']").length)
222 222 
 							{
223 223 
 								$.ajax({
224 
-									url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
224 
+									url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
225 225 
 									dataType: 'html',
226 226 
 									async: false,
227 227 
 									success: function(html) {
 
@@ -264,7 +264,7 @@  discard block
 
 block discarded – undo
264 264 
 						$('#loading').show();
265 265
266 266 
 						$.ajax({
267 
-							url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
267 
+							url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view,
268 268 
 							dataType: 'html',
269 269 
 							async: false,
270 270 
 							success: function(html) {
Please login to merge, or discard this patch.
Braces   +23 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -75,7 +75,11 @@  discard block
 
 block discarded – undo
75 75
76 76 
 					<div id="location_mobile" class="hidden-sm-up">
77 77 
 						<form method="get">
78 
-							<input type="text" id="city_mobile" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
78 
+							<input type="text" id="city_mobile" name="city" placeholder="<?php if(isset($newPositionStatus))
79 
+{
80 
+	echo $newPositionStatus;
81 
+}
82 
+?>" required>
79 83
80 84 
 							<input type="submit" id="submit_mobile" class="fa" value="&#xf0ac;" />
81 85 
 						</form>
 
@@ -102,7 +106,9 @@  discard block
 
 block discarded – undo
102 106
103 107 
 					</content>
104 108
105 
-					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
109 
+					<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
110 
+{
111 
+?>
106 112 
 						<p id="loading">
107 113 
 							Loading…
108 114 
 						</p>
 
@@ -115,7 +121,11 @@  discard block
 
 block discarded – undo
115 121 
 							<div>
116 122 
 								<h2>Position / Hashtag</h2>
117 123 
 								<form method="get">
118 
-									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; ?>" required>
124 
+									<input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus))
125 
+{
126 
+	echo $newPositionStatus;
127 
+}
128 
+?>" required>
119 129 
 									<label>try: #jhj</label><br>
120 130 
 									<input type="submit" value="Set Location" />
121 131 
 								</form>
 
@@ -131,7 +141,9 @@  discard block
 
 block discarded – undo
131 141
132 142 
 						<article>
133 143 
 							<div>
134 
-								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails'])) { ?>
144 
+								<?php if(isset($_GET['postId']) && isset($_GET['getPostDetails']))
145 
+{
146 
+?>
135 147 
 								<h2>Comment on Jodel</h2>
136 148 
 								<form method="POST">
137 149 
 										<input type="hidden" name="ancestor" value="<?php echo htmlspecialchars($_GET['postId']);?>" />
 
@@ -139,7 +151,10 @@  discard block
 
 block discarded – undo
139 151 
 									<br />
140 152 
 									<input type="submit" value="SEND" />
141 153 
 								</form>
142 
-									<?php } else { ?>
154 
+									<?php }
155 
+else
156 
+{
157 
+?>
143 158 
 								<h2>New Jodel</h2>
144 159 
 								<form method="POST">
145 160 
 									<textarea id="message" name="message" placeholder="Send a Jodel to all students within 10km" required></textarea> 
@@ -198,7 +213,9 @@  discard block
 
 block discarded – undo
198 213 
 				    $('html,body').animate({scrollTop: aTag.offset().top-90},'slow');
199 214 
 				}
200 215
201 
-				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?>
216 
+				<?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails']))
217 
+{
218 
+?>
202 219
203 220
204 221
Please login to merge, or discard this patch.
template/nav-bottom.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -2,17 +2,17 @@
 
 block discarded – undo
2 2 
 	<div class="col-xs-12">
3 3 
 		<div class="row">
4 4 
 			<div class="col-xs-3">
5 
-				<a href="<?php echo $baseUrl;?>index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
5 
+				<a href="<?php echo $baseUrl; ?>index.php" <?php if($view == 'time') echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a>
6 6 
 			</div>
7 7 
 			<div class="col-xs-3">
8 
-				<a href="<?php echo $baseUrl;?>index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
8 
+				<a href="<?php echo $baseUrl; ?>index.php?view=comment" <?php if($view == 'comment') echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a>
9 9 
 			</div>
10 10 
 			<div class="col-xs-3">
11 
-				<a href="<?php echo $baseUrl;?>index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
11 
+				<a href="<?php echo $baseUrl; ?>index.php?view=upVote" <?php if($view == 'upVote') echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a>
12 12 
 			</div>
13 13 
 			<div class="col-xs-3">
14 14 
 				<nav>
15 
-					<a href="<?php echo $baseUrl;?>about-us.php">about us</a>
15 
+					<a href="<?php echo $baseUrl; ?>about-us.php">about us</a>
16 16 
 				</nav>
17 17 
 			</div>
18 18 
 		</div>
Please login to merge, or discard this patch.
Braces   +15 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -2,13 +2,25 @@
 
 block discarded – undo
2 2 
 	<div class="col-xs-12">
3 3 
 		<div class="row">
4 4 
 			<div class="col-xs-3">
5 
-				<a href="<?php echo $baseUrl;?>index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a>
5 
+				<a href="<?php echo $baseUrl;?>index.php" <?php if($view=='time')
6 
+{
7 
+	echo 'class="active"';
8 
+}
9 
+?>><i class="fa fa-clock-o fa-3x"></i></a>
6 10 
 			</div>
7 11 
 			<div class="col-xs-3">
8 
-				<a href="<?php echo $baseUrl;?>index.php?view=comment" <?php if($view=='comment') echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a>
12 
+				<a href="<?php echo $baseUrl;?>index.php?view=comment" <?php if($view=='comment')
13 
+{
14 
+	echo 'class="active"';
15 
+}
16 
+?>><i class="fa fa-commenting-o fa-3x"></i></a>
9 17 
 			</div>
10 18 
 			<div class="col-xs-3">
11 
-				<a href="<?php echo $baseUrl;?>index.php?view=upVote" <?php if($view=='upVote') echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a>
19 
+				<a href="<?php echo $baseUrl;?>index.php?view=upVote" <?php if($view=='upVote')
20 
+{
21 
+	echo 'class="active"';
22 
+}
23 
+?>><i class="fa fa-angle-up fa-3x"></i></a>
12 24 
 			</div>
13 25 
 			<div class="col-xs-3">
14 26 
 				<nav>
Please login to merge, or discard this patch.
php/Requests/AbstractRequest.php 3 patches
Indentation   +134 added lines, -134 removed lines patch added patch discarded remove patch 
@@ -2,20 +2,20 @@  discard block
 
 block discarded – undo
2 2
3 3 
 abstract class AbstractRequest
4 4 
 {
5 
-    const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6 
-    const APIURL = 'https://api.go-tellm.com/api';
7 
-    const SECRET = 'LDWWpuUigOnKCbCLpoNMDHCqHCWbLKPzHbnIUKIf';
8 
-    const USERAGENT = 'Jodel/4.33.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
9 
-    const CLIENT_TYPE = 'android_4.33.2';
5 
+	const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6 
+	const APIURL = 'https://api.go-tellm.com/api';
7 
+	const SECRET = 'LDWWpuUigOnKCbCLpoNMDHCqHCWbLKPzHbnIUKIf';
8 
+	const USERAGENT = 'Jodel/4.33.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
9 
+	const CLIENT_TYPE = 'android_4.33.2';
10 10
11 
-    private $accessToken = null;
12 
-    private $payLoad;
13 
-    public $expects = '';
14 
-    public $version = 'v2';
15 
-    public $hasPayload = FALSE;
11 
+	private $accessToken = null;
12 
+	private $payLoad;
13 
+	public $expects = '';
14 
+	public $version = 'v2';
15 
+	public $hasPayload = FALSE;
16 16
17 
-    public function execute()
18 
-    {
17 
+	public function execute()
18 
+	{
19 19 
 		$result = new \stdClass();
20 20
21 21 
 		$this->payLoad = $this->getPayload();
 
@@ -25,16 +25,16 @@  discard block
 
 block discarded – undo
25 25 
 		}
26 26
27 27
28 
-        $this->payLoad = json_encode($this->payLoad);
29 
-        $header = $this->getSignHeaders();
30 
-        $url = $this->getFullUrl();
28 
+		$this->payLoad = json_encode($this->payLoad);
29 
+		$header = $this->getSignHeaders();
30 
+		$url = $this->getFullUrl();
31 31
32 
-        if ($this->getAccessToken()) {
33 
-            $header['Authorization'] = "Bearer " . $this->getAccessToken();
34 
-        }
35 
-        //Comment out to debug the Request:
32 
+		if ($this->getAccessToken()) {
33 
+			$header['Authorization'] = "Bearer " . $this->getAccessToken();
34 
+		}
35 
+		//Comment out to debug the Request:
36 36
37 
-        /*
37 
+		/*
38 38 
         printf("URL: ");
39 39 
         var_dump($url);
40 40 
         echo "<br />";
 
@@ -45,86 +45,86 @@  discard block
 
 block discarded – undo
45 45 
         var_dump($this->payLoad);
46 46 
         echo "<br />";
47 47 
         */
48 
-        /*
48 
+		/*
49 49 
         $options = array(
50 50 
             'timeout' => 100,
51 51 
             'connect_timeout' => 100,
52 52 
             'proxy' => '186.103.169.165:8080',
53 53 
         );*/
54 54
55 
-        switch ($this->getMethod()) {
56 
-            case 'POST':
57 
-                $result = Requests::post($url, $header, $this->payLoad);
58 
-                break;
59 
-            case 'GET':
60 
-                if($this->hasPayload)
61 
-                {
62 
-                    $result = Requests::get($url, $header, $this->payLoad);
63 
-                }
64 
-                else
65 
-                {
66 
-                    $result = Requests::get($url, $header);
67 
-                }
68 
-                break;
69 
-            case 'PUT':
70 
-                $result = Requests::put($url, $header, $this->payLoad);
71 
-                break;
72 
-        }
73 
-        switch ($result->status_code) {
74 
-            case 200:
75 
-                $result = json_decode($result->body, true);
76 
-                break;
77 
-            case 204:
78 
-                $result = "Success";
79 
-                break;
80 
-            case 400:
81 
-                //throw new \Exception('Unauthorized');
82 
-                error_log('Error 400 - Fehlerhafte Anfrage'); // - JodelDeviceId:' . $deviceUid);
83 
-                break;
84 
-            case 401:
55 
+		switch ($this->getMethod()) {
56 
+			case 'POST':
57 
+				$result = Requests::post($url, $header, $this->payLoad);
58 
+				break;
59 
+			case 'GET':
60 
+				if($this->hasPayload)
61 
+				{
62 
+					$result = Requests::get($url, $header, $this->payLoad);
63 
+				}
64 
+				else
65 
+				{
66 
+					$result = Requests::get($url, $header);
67 
+				}
68 
+				break;
69 
+			case 'PUT':
70 
+				$result = Requests::put($url, $header, $this->payLoad);
71 
+				break;
72 
+		}
73 
+		switch ($result->status_code) {
74 
+			case 200:
75 
+				$result = json_decode($result->body, true);
76 
+				break;
77 
+			case 204:
78 
+				$result = "Success";
79 
+				break;
80 
+			case 400:
81 
+				//throw new \Exception('Unauthorized');
82 
+				error_log('Error 400 - Fehlerhafte Anfrage'); // - JodelDeviceId:' . $deviceUid);
83 
+				break;
84 
+			case 401:
85 85 
 				//throw new \Exception('Unauthorized');
86 
-                error_log('Error 401 - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
87 
-                break;
88 
-            case 404:
89 
-                //echo "Es wurde bereits gevoted";
90 
-                error_log('Error 404 - Es wurde bereits gevoted'); // - JodelDeviceId:' . $deviceUid);
86 
+				error_log('Error 401 - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
87 
+				break;
88 
+			case 404:
89 
+				//echo "Es wurde bereits gevoted";
90 
+				error_log('Error 404 - Es wurde bereits gevoted'); // - JodelDeviceId:' . $deviceUid);
91 91 
 			case 477:
92 
-                //echo "Es wurde bereits gevoted";
93 
-                //throw  new \Exception('Signing failed!');
94 
-                error_log('Error 477 - Signing failed'); // - JodelDeviceId:' . $deviceUid);
95 
-                break;
96 
-            case 429:
97 
-                error_log('Error 429 - Too Many Requests'); // - JodelDeviceId:' . $deviceUid);
98 
-            	exit("Error 429: Too Many Requests");
99 
-            	break;
100 
-            case 403:
101 
-                error_log('Error 403 - Access denied'); // - JodelDeviceId:' . $deviceUid);
102 
-                exit("Error 403: Access denied");
103 
-                break;
104 
-            default:
105 
-                error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
106 
-                //throw  new \Exception('Unknown Error: '.$result->status_code);
107 
-        }
92 
+				//echo "Es wurde bereits gevoted";
93 
+				//throw  new \Exception('Signing failed!');
94 
+				error_log('Error 477 - Signing failed'); // - JodelDeviceId:' . $deviceUid);
95 
+				break;
96 
+			case 429:
97 
+				error_log('Error 429 - Too Many Requests'); // - JodelDeviceId:' . $deviceUid);
98 
+				exit("Error 429: Too Many Requests");
99 
+				break;
100 
+			case 403:
101 
+				error_log('Error 403 - Access denied'); // - JodelDeviceId:' . $deviceUid);
102 
+				exit("Error 403: Access denied");
103 
+				break;
104 
+			default:
105 
+				error_log('Error '.$result->status_code.' - Unauthorized'); // - JodelDeviceId:' . $deviceUid);
106 
+				//throw  new \Exception('Unknown Error: '.$result->status_code);
107 
+		}
108 108
109 
-        if($device_uid != '')
110 
-        {
109 
+		if($device_uid != '')
110 
+		{
111 111 
 			$result[0] = $result;
112 112 
 			$result[1] = $device_uid;
113 113 
 	}
114 114
115 
-        /*
115 
+		/*
116 116 
         var_dump($result);
117 117 
         */
118 118
119 
-        return $result;
120 
-    }
121 
-    abstract function getPayload();
122 
-    /**
123 
-     * Gets Sign headers
124 
-     * @return array headers
125 
-     */
126 
-    private function getSignHeaders()
127 
-    {
119 
+		return $result;
120 
+	}
121 
+	abstract function getPayload();
122 
+	/**
123 
+	 * Gets Sign headers
124 
+	 * @return array headers
125 
+	 */
126 
+	private function getSignHeaders()
127 
+	{
128 128 
 			if($this->getAccessToken() == null) {
129 129 
 				$payload_accessToken = "";
130 130 
 			}
 
@@ -133,54 +133,54 @@  discard block
 
 block discarded – undo
133 133 
 			}
134 134
135 135
136 
-        $headers = array(
137 
-            "Connection" => "keep-alive",
138 
-            "Accept-Encoding" => "gzip",
139 
-            "Content-Type" => "application/json; charset=UTF-8",
140 
-            "User-Agent" => self::USERAGENT
141 
-        );
142 
-        $timestamp = new DateTime();
143 
-        $timestamp = $timestamp->format(DateTime::ATOM);
144 
-        $timestamp = substr($timestamp, 0, -6);
145 
-        $timestamp .= "Z";
146 
-        $urlParts = parse_url($this->getFullUrl());
147 
-        $url2 = "";
148 
-        $req = [$this->getMethod(),
149 
-            $urlParts['host'],
150 
-            "443",
151 
-            $urlParts['path'],
152 
-            $payload_accessToken,
153 
-            $timestamp,
154 
-            $url2,
155 
-            $this->payLoad];
156 
-        $reqString = implode("%", $req);
157 
-        $secret = self::SECRET;
158 
-        $signature = hash_hmac('sha1', $reqString, $secret);
159 
-        $signature = strtoupper($signature);
160 
-        $headers['X-Authorization'] = 'HMAC ' . $signature;
161 
-        $headers['X-Client-Type'] = self::CLIENT_TYPE;
162 
-        $headers['X-Timestamp'] = $timestamp;
163 
-        $headers['X-Api-Version'] = '0.2';
164 
-        return $headers;
165 
-    }
166 
-    private function getFullUrl()
167 
-    {
168 
-        return self::APIURL . $this->getApiEndPoint();
169 
-    }
170 
-    abstract function getApiEndPoint();
171 
-    abstract function getMethod();
172 
-    /**
173 
-     * @return string
174 
-     */
175 
-    private function getAccessToken()
176 
-    {
177 
-        return $this->accessToken;
178 
-    }
179 
-    /**
180 
-     * @param string $accessToken
181 
-     */
182 
-    public function setAccessToken($accessToken)
183 
-    {
184 
-        $this->accessToken = $accessToken;
185 
-    }
136 
+		$headers = array(
137 
+			"Connection" => "keep-alive",
138 
+			"Accept-Encoding" => "gzip",
139 
+			"Content-Type" => "application/json; charset=UTF-8",
140 
+			"User-Agent" => self::USERAGENT
141 
+		);
142 
+		$timestamp = new DateTime();
143 
+		$timestamp = $timestamp->format(DateTime::ATOM);
144 
+		$timestamp = substr($timestamp, 0, -6);
145 
+		$timestamp .= "Z";
146 
+		$urlParts = parse_url($this->getFullUrl());
147 
+		$url2 = "";
148 
+		$req = [$this->getMethod(),
149 
+			$urlParts['host'],
150 
+			"443",
151 
+			$urlParts['path'],
152 
+			$payload_accessToken,
153 
+			$timestamp,
154 
+			$url2,
155 
+			$this->payLoad];
156 
+		$reqString = implode("%", $req);
157 
+		$secret = self::SECRET;
158 
+		$signature = hash_hmac('sha1', $reqString, $secret);
159 
+		$signature = strtoupper($signature);
160 
+		$headers['X-Authorization'] = 'HMAC ' . $signature;
161 
+		$headers['X-Client-Type'] = self::CLIENT_TYPE;
162 
+		$headers['X-Timestamp'] = $timestamp;
163 
+		$headers['X-Api-Version'] = '0.2';
164 
+		return $headers;
165 
+	}
166 
+	private function getFullUrl()
167 
+	{
168 
+		return self::APIURL . $this->getApiEndPoint();
169 
+	}
170 
+	abstract function getApiEndPoint();
171 
+	abstract function getMethod();
172 
+	/**
173 
+	 * @return string
174 
+	 */
175 
+	private function getAccessToken()
176 
+	{
177 
+		return $this->accessToken;
178 
+	}
179 
+	/**
180 
+	 * @param string $accessToken
181 
+	 */
182 
+	public function setAccessToken($accessToken)
183 
+	{
184 
+		$this->accessToken = $accessToken;
185 
+	}
186 186 
 }
Please login to merge, or discard this patch.
Braces   +13 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2
3 3 
 abstract class AbstractRequest
4 
-{
4 
+{
5 5 
     const CLIENTID = '81e8a76e-1e02-4d17-9ba0-8a7020261b26';
6 6 
     const APIURL = 'https://api.go-tellm.com/api';
7 7 
     const SECRET = 'LDWWpuUigOnKCbCLpoNMDHCqHCWbLKPzHbnIUKIf';
 
@@ -20,7 +20,8 @@  discard block
 
 block discarded – undo
20 20
21 21 
 		$this->payLoad = $this->getPayload();
22 22 
 		$device_uid = '';
23 
-		if(isset($this->payLoad['device_uid'])) {
23 
+		if(isset($this->payLoad['device_uid']))
24 
+		{
24 25 
 			$device_uid = $this->payLoad['device_uid'];
25 26 
 		}
26 27 
 				
@@ -29,7 +30,8 @@  discard block
 
 block discarded – undo
29 30 
         $header = $this->getSignHeaders();
30 31 
         $url = $this->getFullUrl();
31 32
32 
-        if ($this->getAccessToken()) {
33 
+        if ($this->getAccessToken())
34 
+        {
33 35 
             $header['Authorization'] = "Bearer " . $this->getAccessToken();
34 36 
         }
35 37 
         //Comment out to debug the Request:
 
@@ -52,7 +54,8 @@  discard block
 
 block discarded – undo
52 54 
             'proxy' => '186.103.169.165:8080',
53 55 
         );*/
54 56
55 
-        switch ($this->getMethod()) {
57 
+        switch ($this->getMethod())
58 
+        {
56 59 
             case 'POST':
57 60 
                 $result = Requests::post($url, $header, $this->payLoad);
58 61 
                 break;
 
@@ -70,7 +73,8 @@  discard block
 
 block discarded – undo
70 73 
                 $result = Requests::put($url, $header, $this->payLoad);
71 74 
                 break;
72 75 
         }
73 
-        switch ($result->status_code) {
76 
+        switch ($result->status_code)
77 
+        {
74 78 
             case 200:
75 79 
                 $result = json_decode($result->body, true);
76 80 
                 break;
 
@@ -125,10 +129,12 @@  discard block
 
 block discarded – undo
125 129 
      */
126 130 
     private function getSignHeaders()
127 131 
     {
128 
-			if($this->getAccessToken() == null) {
132 
+			if($this->getAccessToken() == null)
133 
+			{
129 134 
 				$payload_accessToken = "";
130 135 
 			}
131 
-			else {
136 
+			else
137 
+			{
132 138 
 				$payload_accessToken = $this->getAccessToken();
133 139 
 			}
134 140
Please login to merge, or discard this patch.
Upper-Lower-Casing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -8,7 +8,7 @@  discard block
 
 block discarded – undo
8 8 
     const USERAGENT = 'Jodel/4.33.2 Dalvik/2.1.0 (Linux; U; Android 5.1.1; )';
9 9 
     const CLIENT_TYPE = 'android_4.33.2';
10 10
11 
-    private $accessToken = null;
11 
+    private $accessToken = NULL;
12 12 
     private $payLoad;
13 13 
     public $expects = '';
14 14 
     public $version = 'v2';
 
@@ -72,7 +72,7 @@  discard block
 
 block discarded – undo
72 72 
         }
73 73 
         switch ($result->status_code) {
74 74 
             case 200:
75 
-                $result = json_decode($result->body, true);
75 
+                $result = json_decode($result->body, TRUE);
76 76 
                 break;
77 77 
             case 204:
78 78 
                 $result = "Success";
 
@@ -125,7 +125,7 @@  discard block
 
 block discarded – undo
125 125 
      */
126 126 
     private function getSignHeaders()
127 127 
     {
128 
-			if($this->getAccessToken() == null) {
128 
+			if($this->getAccessToken() == NULL) {
129 129 
 				$payload_accessToken = "";
130 130 
 			}
131 131 
 			else {
Please login to merge, or discard this patch.
admin.php 1 patch
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch 
@@ -4,7 +4,7 @@  discard block
 
 block discarded – undo
4 4
5 5 
 if(!isset($_GET['pw']) || $config['pw'] != $_GET['pw'])
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 10 
 
@@ -56,42 +56,42 @@  discard block
 
 block discarded – undo
56 56 
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client">
57 57
58 58 
 		<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">
59 
-				<link rel="stylesheet" href="<?php echo $baseUrl;?>css/font-awesome.min.css">
60 
-		<link rel="stylesheet" href="<?php echo $baseUrl;?>style.css" type="text/css">
59 
+				<link rel="stylesheet" href="<?php echo $baseUrl; ?>css/font-awesome.min.css">
60 
+		<link rel="stylesheet" href="<?php echo $baseUrl; ?>style.css" type="text/css">
61 61
62 
-		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
63 
-		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl;?>img/favicon/favicon.ico">
64 
-		<link rel="icon" type="image/gif" href="<?php echo $baseUrl;?>img/favicon/favicon.gif">
65 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon.png">
66 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon.png">
67 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
68 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
69 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
70 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
71 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
72 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
73 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
74 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
75 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
76 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
77 
-		<link rel="apple-touch-icon" href="<?php echo $baseUrl;?>img/favicon/apple-touch-icon-precomposed.png">
78 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-16x16.png" sizes="16x16">
79 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-32x32.png" sizes="32x32">
80 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-96x96.png" sizes="96x96">
81 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-160x160.png" sizes="160x160">
82 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-192x192.png" sizes="192x192">
83 
-		<link rel="icon" type="image/png" href="<?php echo $baseUrl;?>img/favicon/favicon-196x196.png" sizes="196x196">
84 
-		<meta name="msapplication-TileImage" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png">
62 
+		<link rel="shortcut icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
63 
+		<link rel="icon" type="image/x-icon" href="<?php echo $baseUrl; ?>img/favicon/favicon.ico">
64 
+		<link rel="icon" type="image/gif" href="<?php echo $baseUrl; ?>img/favicon/favicon.gif">
65 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon.png">
66 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon.png">
67 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-57x57.png" sizes="57x57">
68 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-60x60.png" sizes="60x60">
69 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-72x72.png" sizes="72x72">
70 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-76x76.png" sizes="76x76">
71 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-114x114.png" sizes="114x114">
72 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-120x120.png" sizes="120x120">
73 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-128x128.png" sizes="128x128">
74 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-144x144.png" sizes="144x144">
75 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-152x152.png" sizes="152x152">
76 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-180x180.png" sizes="180x180">
77 
+		<link rel="apple-touch-icon" href="<?php echo $baseUrl; ?>img/favicon/apple-touch-icon-precomposed.png">
78 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-16x16.png" sizes="16x16">
79 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-32x32.png" sizes="32x32">
80 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-96x96.png" sizes="96x96">
81 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-160x160.png" sizes="160x160">
82 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-192x192.png" sizes="192x192">
83 
+		<link rel="icon" type="image/png" href="<?php echo $baseUrl; ?>img/favicon/favicon-196x196.png" sizes="196x196">
84 
+		<meta name="msapplication-TileImage" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png">
85 85 
 		<meta name="msapplication-TileColor" content="#5682a3">
86 86 
 		<meta name="msapplication-navbutton-color" content="#5682a3">
87 87 
 		<meta name="application-name" content="JodelBlue"/>
88 88 
 		<meta name="msapplication-tooltip" content="JodelBlue"/>
89 89 
 		<meta name="apple-mobile-web-app-title" content="JodelBlue"/>
90 
-		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-70x70.png">
91 
-		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-144x144.png">
92 
-		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-150x150.png">
93 
-		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x150.png">
94 
-		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl;?>img/favicon/win8-tile-310x310.png">
90 
+		<meta name="msapplication-square70x70logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-70x70.png">
91 
+		<meta name="msapplication-square144x144logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-144x144.png">
92 
+		<meta name="msapplication-square150x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-150x150.png">
93 
+		<meta name="msapplication-wide310x150logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x150.png">
94 
+		<meta name="msapplication-square310x310logo" content="<?php echo $baseUrl; ?>img/favicon/win8-tile-310x310.png">
95 95 
 	</head>
96 96
97 97 
 	<body>
 
@@ -179,7 +179,7 @@  discard block
 
 block discarded – undo
179 179 
 			{
180 180 
 				$.ajax({
181 181 
 				  type: "POST",
182 
-				  url: "<?php echo $baseUrl;?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>",
182 
+				  url: "<?php echo $baseUrl; ?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>",
183 183 
 				  data: {"vote" : data["vote"],
184 184 
 						 "postId" : data["id"]},
185 185 
 				  success: function(result){
 
@@ -226,7 +226,7 @@  discard block
 
 block discarded – undo
226 226 
 				console.log(solution);
227 227 
 				$.ajax({
228 228 
 				  type: "POST",
229 
-				  url: "<?php echo $baseUrl;?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>&solution=" + solution + "&key="+key,
229 
+				  url: "<?php echo $baseUrl; ?>vote-ajax.php?pw=<?php echo $_GET["pw"]?>&solution=" + solution + "&key="+key,
230 230 
 				  data: {"deviceUid" : deviceUid},
231 231 
 				  success: function(result){
232 232 
 					  var response = JSON.parse(result);
Please login to merge, or discard this patch.
about-us.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch 
@@ -11,42 +11,42 @@  discard block
 
 block discarded – undo
11 11 
 		<meta name="keywords" content="jodelblue, jodel, blue, webclient, web, client">
12 12
13 13 
 		<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">
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>
 
@@ -115,7 +115,7 @@  discard block
 
 block discarded – undo
115 115 
 					</content>
116 116 
 				</article>
117 117 
 			</div>
118 
-			<?php include './template/nav-bottom.php';?>
118 
+			<?php include './template/nav-bottom.php'; ?>
119 119 
 		</div>
120 120
121 121
Please login to merge, or discard this patch.