mmainstreet /
jodel-web
@@ -320,7 +320,7 @@ |
||
| 320 | 320 | <?php |
| 321 | 321 | if(is_file($baseUrl . '/piwik-script.html')) |
| 322 | 322 | { |
| 323 | - require_once($baseUrl . '/piwik-script.html'); |
|
| 323 | + require_once($baseUrl . '/piwik-script.html'); |
|
| 324 | 324 | } |
| 325 | 325 | ?> |
| 326 | 326 | |
@@ -1,53 +1,53 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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" /> |
@@ -171,17 +171,17 @@ discard block |
||
| 171 | 171 | <div class="col-xs-12"> |
| 172 | 172 | <div class="row"> |
| 173 | 173 | <div class="col-xs-3"> |
| 174 | - <a href="<?php echo $baseUrl;?>index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a> |
|
| 174 | + <a href="<?php echo $baseUrl; ?>index.php" <?php if($view == 'time') echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a> |
|
| 175 | 175 | </div> |
| 176 | 176 | <div class="col-xs-3"> |
| 177 | - <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> |
|
| 177 | + <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> |
|
| 178 | 178 | </div> |
| 179 | 179 | <div class="col-xs-3"> |
| 180 | - <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> |
|
| 180 | + <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> |
|
| 181 | 181 | </div> |
| 182 | 182 | <div class="col-xs-3"> |
| 183 | 183 | <nav> |
| 184 | - <a href="<?php echo $baseUrl;?>about-us.html">about us</a> |
|
| 184 | + <a href="<?php echo $baseUrl; ?>about-us.html">about us</a> |
|
| 185 | 185 | </nav> |
| 186 | 186 | </div> |
| 187 | 187 | </div> |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7" crossorigin="anonymous"></script> |
| 195 | 195 | <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js" integrity="sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8" crossorigin="anonymous"></script> |
| 196 | 196 | <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.5/js/bootstrap.min.js" integrity="sha384-BLiI7JTZm+JWlgKa0M0kGRpJbF2J8q+qreVrKBC47e3K6BW78kGLrCkeRX6I9RoK" crossorigin="anonymous"></script> |
| 197 | - <script src="<?php echo $baseUrl;?>js/jQueryEmoji.js"></script> |
|
| 197 | + <script src="<?php echo $baseUrl; ?>js/jQueryEmoji.js"></script> |
|
| 198 | 198 | |
| 199 | 199 | <script> |
| 200 | 200 | //BackButton |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | if(!$("article[id='"+ hash +"']").length) |
| 242 | 242 | { |
| 243 | 243 | $.ajax({ |
| 244 | - url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view, |
|
| 244 | + url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view, |
|
| 245 | 245 | dataType: 'html', |
| 246 | 246 | async: false, |
| 247 | 247 | success: function(html) { |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | $('#loading').show(); |
| 285 | 285 | |
| 286 | 286 | $.ajax({ |
| 287 | - url: '<?php echo $baseUrl;?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view, |
|
| 287 | + url: '<?php echo $baseUrl; ?>get-posts-ajax.php?lastPostId=' + lastPostId + '&view=' + view, |
|
| 288 | 288 | dataType: 'html', |
| 289 | 289 | async: false, |
| 290 | 290 | success: function(html) { |
@@ -75,7 +75,11 @@ discard block |
||
| 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="" /> |
| 81 | 85 | </form> |
@@ -102,7 +106,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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> |
@@ -171,13 +186,25 @@ discard block |
||
| 171 | 186 | <div class="col-xs-12"> |
| 172 | 187 | <div class="row"> |
| 173 | 188 | <div class="col-xs-3"> |
| 174 | - <a href="<?php echo $baseUrl;?>index.php" <?php if($view=='time') echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a> |
|
| 189 | + <a href="<?php echo $baseUrl;?>index.php" <?php if($view=='time') |
|
| 190 | +{ |
|
| 191 | + echo 'class="active"'; |
|
| 192 | +} |
|
| 193 | +?>><i class="fa fa-clock-o fa-3x"></i></a> |
|
| 175 | 194 | </div> |
| 176 | 195 | <div class="col-xs-3"> |
| 177 | - <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> |
|
| 196 | + <a href="<?php echo $baseUrl;?>index.php?view=comment" <?php if($view=='comment') |
|
| 197 | +{ |
|
| 198 | + echo 'class="active"'; |
|
| 199 | +} |
|
| 200 | +?>><i class="fa fa-commenting-o fa-3x"></i></a> |
|
| 178 | 201 | </div> |
| 179 | 202 | <div class="col-xs-3"> |
| 180 | - <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> |
|
| 203 | + <a href="<?php echo $baseUrl;?>index.php?view=upVote" <?php if($view=='upVote') |
|
| 204 | +{ |
|
| 205 | + echo 'class="active"'; |
|
| 206 | +} |
|
| 207 | +?>><i class="fa fa-angle-up fa-3x"></i></a> |
|
| 181 | 208 | </div> |
| 182 | 209 | <div class="col-xs-3"> |
| 183 | 210 | <nav> |
@@ -218,7 +245,9 @@ discard block |
||
| 218 | 245 | $('html,body').animate({scrollTop: aTag.offset().top-90},'slow'); |
| 219 | 246 | } |
| 220 | 247 | |
| 221 | - <?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) { ?> |
|
| 248 | + <?php if(!isset($_GET['postId']) && !isset($_GET['getPostDetails'])) |
|
| 249 | +{ |
|
| 250 | +?> |
|
| 222 | 251 | |
| 223 | 252 | |
| 224 | 253 | |
@@ -2,491 +2,491 @@ |
||
| 2 | 2 | |
| 3 | 3 | class JodelAccount |
| 4 | 4 | { |
| 5 | - public $accessToken; |
|
| 6 | - public $expirationDate; |
|
| 7 | - public $refreshToken; |
|
| 8 | - public $distinctId; |
|
| 9 | - public $deviceUid; |
|
| 10 | - |
|
| 11 | - //is the Account a Bot or Spider? |
|
| 12 | - public $isBot; |
|
| 5 | + public $accessToken; |
|
| 6 | + public $expirationDate; |
|
| 7 | + public $refreshToken; |
|
| 8 | + public $distinctId; |
|
| 9 | + public $deviceUid; |
|
| 10 | + |
|
| 11 | + //is the Account a Bot or Spider? |
|
| 12 | + public $isBot; |
|
| 13 | 13 | |
| 14 | - // array of voted Jodels |
|
| 15 | - public $votes; |
|
| 16 | - |
|
| 17 | - //Location of the Account |
|
| 18 | - public $location; |
|
| 19 | - |
|
| 20 | - function __construct($deviceUid = NULL, $isBot = FALSE) |
|
| 21 | - { |
|
| 22 | - if($deviceUid == NULL) |
|
| 23 | - { |
|
| 24 | - $this->deviceUid = $this->createAccount(); |
|
| 25 | - } |
|
| 26 | - else |
|
| 27 | - { |
|
| 28 | - $this->deviceUid = $deviceUid; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - $this->isBot = $isBot; |
|
| 32 | - $this->location = $this->getLocation(); |
|
| 33 | - |
|
| 34 | - if(!$this->isTokenFresh()) |
|
| 35 | - { |
|
| 36 | - $this->refreshToken(); |
|
| 37 | - } |
|
| 38 | - $this->accessToken = $this->getAccessToken(); |
|
| 39 | - } |
|
| 40 | - |
|
| 41 | - function isAccountVerified() |
|
| 42 | - { |
|
| 43 | - $accountCreator = new GetUserConfig(); |
|
| 44 | - $accountCreator->setAccessToken($this->accessToken); |
|
| 45 | - $data = $accountCreator->execute(); |
|
| 46 | - |
|
| 47 | - return $data['verified']; |
|
| 48 | - } |
|
| 49 | - |
|
| 50 | - function locationEquals($city) |
|
| 51 | - { |
|
| 52 | - $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
|
| 53 | - $result = Requests::post($url); |
|
| 54 | - if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST') |
|
| 55 | - { |
|
| 56 | - error_log('Error locationEquals'); |
|
| 57 | - return FALSE; |
|
| 58 | - } |
|
| 59 | - else |
|
| 60 | - { |
|
| 61 | - $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name']; |
|
| 62 | - $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat']; |
|
| 63 | - $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng']; |
|
| 64 | - } |
|
| 65 | - |
|
| 66 | - $db = new DatabaseConnect(); |
|
| 67 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 14 | + // array of voted Jodels |
|
| 15 | + public $votes; |
|
| 16 | + |
|
| 17 | + //Location of the Account |
|
| 18 | + public $location; |
|
| 19 | + |
|
| 20 | + function __construct($deviceUid = NULL, $isBot = FALSE) |
|
| 21 | + { |
|
| 22 | + if($deviceUid == NULL) |
|
| 23 | + { |
|
| 24 | + $this->deviceUid = $this->createAccount(); |
|
| 25 | + } |
|
| 26 | + else |
|
| 27 | + { |
|
| 28 | + $this->deviceUid = $deviceUid; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + $this->isBot = $isBot; |
|
| 32 | + $this->location = $this->getLocation(); |
|
| 33 | + |
|
| 34 | + if(!$this->isTokenFresh()) |
|
| 35 | + { |
|
| 36 | + $this->refreshToken(); |
|
| 37 | + } |
|
| 38 | + $this->accessToken = $this->getAccessToken(); |
|
| 39 | + } |
|
| 40 | + |
|
| 41 | + function isAccountVerified() |
|
| 42 | + { |
|
| 43 | + $accountCreator = new GetUserConfig(); |
|
| 44 | + $accountCreator->setAccessToken($this->accessToken); |
|
| 45 | + $data = $accountCreator->execute(); |
|
| 46 | + |
|
| 47 | + return $data['verified']; |
|
| 48 | + } |
|
| 49 | + |
|
| 50 | + function locationEquals($city) |
|
| 51 | + { |
|
| 52 | + $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
|
| 53 | + $result = Requests::post($url); |
|
| 54 | + if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST') |
|
| 55 | + { |
|
| 56 | + error_log('Error locationEquals'); |
|
| 57 | + return FALSE; |
|
| 58 | + } |
|
| 59 | + else |
|
| 60 | + { |
|
| 61 | + $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name']; |
|
| 62 | + $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat']; |
|
| 63 | + $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng']; |
|
| 64 | + } |
|
| 65 | + |
|
| 66 | + $db = new DatabaseConnect(); |
|
| 67 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 68 | 68 | |
| 69 | - $location = new Location(); |
|
| 69 | + $location = new Location(); |
|
| 70 | 70 | |
| 71 | - if ($result->num_rows > 0) |
|
| 72 | - { |
|
| 73 | - // output data of each row |
|
| 74 | - while($row = $result->fetch_assoc()) |
|
| 75 | - { |
|
| 76 | - $location->setLat($row['lat']); |
|
| 77 | - $location->setLng($row['lng']); |
|
| 78 | - $location->setCityName($row['name']); |
|
| 79 | - } |
|
| 80 | - } |
|
| 81 | - else |
|
| 82 | - { |
|
| 83 | - echo "Error: 0 results"; |
|
| 84 | - error_log("Error no Location found - getLocation"); |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name) |
|
| 88 | - { |
|
| 89 | - return TRUE; |
|
| 90 | - } |
|
| 91 | - else |
|
| 92 | - { |
|
| 93 | - return FALSE; |
|
| 94 | - } |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - function setLocation() |
|
| 98 | - { |
|
| 99 | - //Is Channel or City |
|
| 100 | - if(substr($_GET['city'], 0, 1) === '#') |
|
| 101 | - { |
|
| 102 | - return htmlspecialchars($_GET['city']) . " " . $this->location->cityName; |
|
| 103 | - } |
|
| 104 | - else |
|
| 105 | - { |
|
| 106 | - $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
|
| 107 | - $result = Requests::post($url); |
|
| 108 | - if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST') |
|
| 109 | - { |
|
| 110 | - return "0 results"; |
|
| 111 | - } |
|
| 112 | - else |
|
| 113 | - { |
|
| 114 | - $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name']; |
|
| 115 | - $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat']; |
|
| 116 | - $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng']; |
|
| 117 | - |
|
| 118 | - $location = new Location(); |
|
| 119 | - $location->setLat($lat); |
|
| 120 | - $location->setLng($lng); |
|
| 121 | - $location->setCityName($name); |
|
| 122 | - $accountCreator = new UpdateLocation(); |
|
| 123 | - $accountCreator->setLocation($location); |
|
| 124 | - $accountCreator->setAccessToken($this->accessToken); |
|
| 125 | - $data = $accountCreator->execute(); |
|
| 126 | - |
|
| 127 | - //safe location to db |
|
| 128 | - $db = new DatabaseConnect(); |
|
| 129 | - |
|
| 130 | - if($data == 'Success') |
|
| 131 | - { |
|
| 132 | - $result = $db->query("UPDATE accounts |
|
| 71 | + if ($result->num_rows > 0) |
|
| 72 | + { |
|
| 73 | + // output data of each row |
|
| 74 | + while($row = $result->fetch_assoc()) |
|
| 75 | + { |
|
| 76 | + $location->setLat($row['lat']); |
|
| 77 | + $location->setLng($row['lng']); |
|
| 78 | + $location->setCityName($row['name']); |
|
| 79 | + } |
|
| 80 | + } |
|
| 81 | + else |
|
| 82 | + { |
|
| 83 | + echo "Error: 0 results"; |
|
| 84 | + error_log("Error no Location found - getLocation"); |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name) |
|
| 88 | + { |
|
| 89 | + return TRUE; |
|
| 90 | + } |
|
| 91 | + else |
|
| 92 | + { |
|
| 93 | + return FALSE; |
|
| 94 | + } |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + function setLocation() |
|
| 98 | + { |
|
| 99 | + //Is Channel or City |
|
| 100 | + if(substr($_GET['city'], 0, 1) === '#') |
|
| 101 | + { |
|
| 102 | + return htmlspecialchars($_GET['city']) . " " . $this->location->cityName; |
|
| 103 | + } |
|
| 104 | + else |
|
| 105 | + { |
|
| 106 | + $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
|
| 107 | + $result = Requests::post($url); |
|
| 108 | + if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST') |
|
| 109 | + { |
|
| 110 | + return "0 results"; |
|
| 111 | + } |
|
| 112 | + else |
|
| 113 | + { |
|
| 114 | + $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name']; |
|
| 115 | + $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat']; |
|
| 116 | + $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng']; |
|
| 117 | + |
|
| 118 | + $location = new Location(); |
|
| 119 | + $location->setLat($lat); |
|
| 120 | + $location->setLng($lng); |
|
| 121 | + $location->setCityName($name); |
|
| 122 | + $accountCreator = new UpdateLocation(); |
|
| 123 | + $accountCreator->setLocation($location); |
|
| 124 | + $accountCreator->setAccessToken($this->accessToken); |
|
| 125 | + $data = $accountCreator->execute(); |
|
| 126 | + |
|
| 127 | + //safe location to db |
|
| 128 | + $db = new DatabaseConnect(); |
|
| 129 | + |
|
| 130 | + if($data == 'Success') |
|
| 131 | + { |
|
| 132 | + $result = $db->query("UPDATE accounts |
|
| 133 | 133 | SET name='" . $name . "', |
| 134 | 134 | lat='" . $lat . "', |
| 135 | 135 | lng='" . $lng . "' |
| 136 | 136 | WHERE access_token='" . $this->accessToken . "'"); |
| 137 | 137 | |
| 138 | - if($result === false) |
|
| 139 | - { |
|
| 140 | - echo "Updating location failed: (" . $db->errno . ") " . $db->error; |
|
| 141 | - } |
|
| 142 | - else |
|
| 143 | - { |
|
| 144 | - error_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name); |
|
| 145 | - } |
|
| 146 | - } |
|
| 147 | - |
|
| 148 | - return $name; |
|
| 149 | - } |
|
| 150 | - } |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - function getLocation() |
|
| 154 | - { |
|
| 155 | - $db = new DatabaseConnect(); |
|
| 156 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 138 | + if($result === false) |
|
| 139 | + { |
|
| 140 | + echo "Updating location failed: (" . $db->errno . ") " . $db->error; |
|
| 141 | + } |
|
| 142 | + else |
|
| 143 | + { |
|
| 144 | + error_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name); |
|
| 145 | + } |
|
| 146 | + } |
|
| 147 | + |
|
| 148 | + return $name; |
|
| 149 | + } |
|
| 150 | + } |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + function getLocation() |
|
| 154 | + { |
|
| 155 | + $db = new DatabaseConnect(); |
|
| 156 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 157 | 157 | |
| 158 | - $location = new Location(); |
|
| 158 | + $location = new Location(); |
|
| 159 | 159 | |
| 160 | - if ($result->num_rows > 0) |
|
| 161 | - { |
|
| 162 | - // output data of each row |
|
| 163 | - while($row = $result->fetch_assoc()) |
|
| 164 | - { |
|
| 165 | - $location->setLat($row['lat']); |
|
| 166 | - $location->setLng($row['lng']); |
|
| 167 | - $location->setCityName($row['name']); |
|
| 168 | - } |
|
| 169 | - } |
|
| 170 | - else |
|
| 171 | - { |
|
| 172 | - echo "Error: 0 results"; |
|
| 173 | - error_log("Error no Location found - getLocation"); |
|
| 174 | - } |
|
| 175 | - |
|
| 176 | - return $location; |
|
| 177 | - } |
|
| 178 | - |
|
| 179 | - function verifyCaptcha() |
|
| 180 | - { |
|
| 181 | - if(isset($_GET['deviceUid'])) |
|
| 182 | - { |
|
| 183 | - $deviceUid = $_GET['deviceUid']; |
|
| 184 | - } |
|
| 185 | - if(isset($_POST['deviceUid'])) |
|
| 186 | - { |
|
| 187 | - $deviceUid = $_POST['deviceUid']; |
|
| 188 | - } |
|
| 189 | - $jodelAccountForVerify = new JodelAccount($deviceUid); |
|
| 190 | - |
|
| 191 | - $solution = $_GET['solution']; |
|
| 192 | - $solution = array_map('intval', explode('-', $solution)); |
|
| 193 | - |
|
| 194 | - $accountCreator = new PostCaptcha(); |
|
| 195 | - $accountCreator->setAccessToken($jodelAccountForVerify->accessToken); |
|
| 196 | - $accountCreator->captchaKey = $_GET['key']; |
|
| 197 | - $accountCreator->captchaSolution = $solution; |
|
| 198 | - $verified = $accountCreator->execute(); |
|
| 199 | - |
|
| 200 | - if(isset($verified->status_code)) |
|
| 201 | - { |
|
| 202 | - return $verified->status_code; |
|
| 203 | - } |
|
| 204 | - return $verified['verified']; |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - //ToDo Spider Check |
|
| 208 | - function votePostId($postId, $vote) |
|
| 209 | - { |
|
| 210 | - if(!$this->isAccountVerified()) |
|
| 211 | - { |
|
| 212 | - $view = new View(); |
|
| 213 | - $view->showCaptcha($this->accessToken, $this->deviceUid); |
|
| 214 | - } |
|
| 215 | - |
|
| 216 | - if(!$this->hasVoted($postId)) |
|
| 217 | - { |
|
| 218 | - if($vote == "up") |
|
| 219 | - { |
|
| 220 | - $accountCreator = new Upvote(); |
|
| 221 | - } |
|
| 222 | - else if($vote == "down") |
|
| 223 | - { |
|
| 224 | - $accountCreator = new Downvote(); |
|
| 225 | - } |
|
| 226 | - $accountCreator->setAccessToken($this->accessToken); |
|
| 227 | - $accountCreator->postId = htmlspecialchars($postId); |
|
| 228 | - $data = $accountCreator->execute(); |
|
| 229 | - |
|
| 230 | - if(array_key_exists('post', $data)) |
|
| 231 | - { |
|
| 232 | - $this->addVoteWithPostIdAndType($postId, $vote); |
|
| 233 | - return TRUE; |
|
| 234 | - } |
|
| 235 | - else |
|
| 236 | - { |
|
| 237 | - error_log("Could not vote: " . var_dump($data)); |
|
| 238 | - return FALSE; |
|
| 239 | - } |
|
| 240 | - } |
|
| 241 | - else |
|
| 242 | - { |
|
| 243 | - return FALSE; |
|
| 244 | - } |
|
| 245 | - } |
|
| 246 | - |
|
| 247 | - //ToDo Spider Check |
|
| 248 | - function sendJodel() |
|
| 249 | - { |
|
| 250 | - if(!$this->isAccountVerified()) |
|
| 251 | - { |
|
| 252 | - showCaptcha($this->accessToken); |
|
| 253 | - } |
|
| 254 | - |
|
| 255 | - $accountCreator = new SendJodel(); |
|
| 256 | - |
|
| 257 | - if(isset($_POST['ancestor'])) |
|
| 258 | - { |
|
| 259 | - $ancestor = $_POST['ancestor']; |
|
| 260 | - $accountCreator->ancestor = $ancestor; |
|
| 261 | - } |
|
| 262 | - if(isset($_POST['color'])) |
|
| 263 | - { |
|
| 264 | - $color = $_POST['color']; |
|
| 265 | - switch ($color) { |
|
| 266 | - case '8ABDB0': |
|
| 267 | - $color = '8ABDB0'; |
|
| 268 | - break; |
|
| 269 | - case '9EC41C': |
|
| 270 | - $color = '9EC41C'; |
|
| 271 | - break; |
|
| 272 | - case '06A3CB': |
|
| 273 | - $color = '06A3CB'; |
|
| 274 | - break; |
|
| 275 | - case 'FFBA00': |
|
| 276 | - $color = 'FFBA00'; |
|
| 277 | - break; |
|
| 278 | - case 'DD5F5F': |
|
| 279 | - $color = 'DD5F5F'; |
|
| 280 | - break; |
|
| 281 | - case 'FF9908': |
|
| 282 | - $color = 'FF9908'; |
|
| 283 | - break; |
|
| 284 | - default: |
|
| 285 | - $color = '8ABDB0'; |
|
| 286 | - break; |
|
| 287 | - } |
|
| 288 | - $accountCreator->color = $color; |
|
| 289 | - } |
|
| 290 | - |
|
| 291 | - $accountCreatorLocation = new UpdateLocation(); |
|
| 292 | - $accountCreatorLocation->setLocation($this->location); |
|
| 293 | - $accountCreatorLocation->setAccessToken($this->accessToken); |
|
| 294 | - $data = $accountCreatorLocation->execute(); |
|
| 160 | + if ($result->num_rows > 0) |
|
| 161 | + { |
|
| 162 | + // output data of each row |
|
| 163 | + while($row = $result->fetch_assoc()) |
|
| 164 | + { |
|
| 165 | + $location->setLat($row['lat']); |
|
| 166 | + $location->setLng($row['lng']); |
|
| 167 | + $location->setCityName($row['name']); |
|
| 168 | + } |
|
| 169 | + } |
|
| 170 | + else |
|
| 171 | + { |
|
| 172 | + echo "Error: 0 results"; |
|
| 173 | + error_log("Error no Location found - getLocation"); |
|
| 174 | + } |
|
| 175 | + |
|
| 176 | + return $location; |
|
| 177 | + } |
|
| 178 | + |
|
| 179 | + function verifyCaptcha() |
|
| 180 | + { |
|
| 181 | + if(isset($_GET['deviceUid'])) |
|
| 182 | + { |
|
| 183 | + $deviceUid = $_GET['deviceUid']; |
|
| 184 | + } |
|
| 185 | + if(isset($_POST['deviceUid'])) |
|
| 186 | + { |
|
| 187 | + $deviceUid = $_POST['deviceUid']; |
|
| 188 | + } |
|
| 189 | + $jodelAccountForVerify = new JodelAccount($deviceUid); |
|
| 190 | + |
|
| 191 | + $solution = $_GET['solution']; |
|
| 192 | + $solution = array_map('intval', explode('-', $solution)); |
|
| 193 | + |
|
| 194 | + $accountCreator = new PostCaptcha(); |
|
| 195 | + $accountCreator->setAccessToken($jodelAccountForVerify->accessToken); |
|
| 196 | + $accountCreator->captchaKey = $_GET['key']; |
|
| 197 | + $accountCreator->captchaSolution = $solution; |
|
| 198 | + $verified = $accountCreator->execute(); |
|
| 199 | + |
|
| 200 | + if(isset($verified->status_code)) |
|
| 201 | + { |
|
| 202 | + return $verified->status_code; |
|
| 203 | + } |
|
| 204 | + return $verified['verified']; |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + //ToDo Spider Check |
|
| 208 | + function votePostId($postId, $vote) |
|
| 209 | + { |
|
| 210 | + if(!$this->isAccountVerified()) |
|
| 211 | + { |
|
| 212 | + $view = new View(); |
|
| 213 | + $view->showCaptcha($this->accessToken, $this->deviceUid); |
|
| 214 | + } |
|
| 215 | + |
|
| 216 | + if(!$this->hasVoted($postId)) |
|
| 217 | + { |
|
| 218 | + if($vote == "up") |
|
| 219 | + { |
|
| 220 | + $accountCreator = new Upvote(); |
|
| 221 | + } |
|
| 222 | + else if($vote == "down") |
|
| 223 | + { |
|
| 224 | + $accountCreator = new Downvote(); |
|
| 225 | + } |
|
| 226 | + $accountCreator->setAccessToken($this->accessToken); |
|
| 227 | + $accountCreator->postId = htmlspecialchars($postId); |
|
| 228 | + $data = $accountCreator->execute(); |
|
| 229 | + |
|
| 230 | + if(array_key_exists('post', $data)) |
|
| 231 | + { |
|
| 232 | + $this->addVoteWithPostIdAndType($postId, $vote); |
|
| 233 | + return TRUE; |
|
| 234 | + } |
|
| 235 | + else |
|
| 236 | + { |
|
| 237 | + error_log("Could not vote: " . var_dump($data)); |
|
| 238 | + return FALSE; |
|
| 239 | + } |
|
| 240 | + } |
|
| 241 | + else |
|
| 242 | + { |
|
| 243 | + return FALSE; |
|
| 244 | + } |
|
| 245 | + } |
|
| 246 | + |
|
| 247 | + //ToDo Spider Check |
|
| 248 | + function sendJodel() |
|
| 249 | + { |
|
| 250 | + if(!$this->isAccountVerified()) |
|
| 251 | + { |
|
| 252 | + showCaptcha($this->accessToken); |
|
| 253 | + } |
|
| 254 | + |
|
| 255 | + $accountCreator = new SendJodel(); |
|
| 256 | + |
|
| 257 | + if(isset($_POST['ancestor'])) |
|
| 258 | + { |
|
| 259 | + $ancestor = $_POST['ancestor']; |
|
| 260 | + $accountCreator->ancestor = $ancestor; |
|
| 261 | + } |
|
| 262 | + if(isset($_POST['color'])) |
|
| 263 | + { |
|
| 264 | + $color = $_POST['color']; |
|
| 265 | + switch ($color) { |
|
| 266 | + case '8ABDB0': |
|
| 267 | + $color = '8ABDB0'; |
|
| 268 | + break; |
|
| 269 | + case '9EC41C': |
|
| 270 | + $color = '9EC41C'; |
|
| 271 | + break; |
|
| 272 | + case '06A3CB': |
|
| 273 | + $color = '06A3CB'; |
|
| 274 | + break; |
|
| 275 | + case 'FFBA00': |
|
| 276 | + $color = 'FFBA00'; |
|
| 277 | + break; |
|
| 278 | + case 'DD5F5F': |
|
| 279 | + $color = 'DD5F5F'; |
|
| 280 | + break; |
|
| 281 | + case 'FF9908': |
|
| 282 | + $color = 'FF9908'; |
|
| 283 | + break; |
|
| 284 | + default: |
|
| 285 | + $color = '8ABDB0'; |
|
| 286 | + break; |
|
| 287 | + } |
|
| 288 | + $accountCreator->color = $color; |
|
| 289 | + } |
|
| 290 | + |
|
| 291 | + $accountCreatorLocation = new UpdateLocation(); |
|
| 292 | + $accountCreatorLocation->setLocation($this->location); |
|
| 293 | + $accountCreatorLocation->setAccessToken($this->accessToken); |
|
| 294 | + $data = $accountCreatorLocation->execute(); |
|
| 295 | 295 | |
| 296 | - $accountCreator->location = $this->location; |
|
| 296 | + $accountCreator->location = $this->location; |
|
| 297 | 297 | |
| 298 | - $accountCreator->setAccessToken($this->accessToken); |
|
| 299 | - $data = $accountCreator->execute(); |
|
| 300 | - |
|
| 301 | - if(isset($_POST['ancestor'])) |
|
| 302 | - { |
|
| 303 | - $actual_link = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 304 | - header('Location: ' . $actual_link . '#postId-' . htmlspecialchars($data['post_id'])); |
|
| 305 | - exit; |
|
| 306 | - } |
|
| 307 | - else |
|
| 308 | - { |
|
| 309 | - header('Location: ./#'); |
|
| 310 | - exit; |
|
| 311 | - } |
|
| 312 | - } |
|
| 313 | - |
|
| 314 | - function isTokenFresh() |
|
| 315 | - { |
|
| 316 | - $db = new DatabaseConnect(); |
|
| 317 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 318 | - |
|
| 319 | - if ($result->num_rows > 0) |
|
| 320 | - { |
|
| 321 | - // output data of each row |
|
| 322 | - while($row = $result->fetch_assoc()) |
|
| 323 | - { |
|
| 324 | - $expiration_date = $row["expiration_date"]; |
|
| 325 | - } |
|
| 326 | - } |
|
| 327 | - else |
|
| 328 | - { |
|
| 329 | - error_log('0 results'); |
|
| 330 | - } |
|
| 331 | - |
|
| 332 | - if($expiration_date <= time()) |
|
| 333 | - { |
|
| 334 | - return FLASE; |
|
| 335 | - } |
|
| 298 | + $accountCreator->setAccessToken($this->accessToken); |
|
| 299 | + $data = $accountCreator->execute(); |
|
| 300 | + |
|
| 301 | + if(isset($_POST['ancestor'])) |
|
| 302 | + { |
|
| 303 | + $actual_link = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 304 | + header('Location: ' . $actual_link . '#postId-' . htmlspecialchars($data['post_id'])); |
|
| 305 | + exit; |
|
| 306 | + } |
|
| 307 | + else |
|
| 308 | + { |
|
| 309 | + header('Location: ./#'); |
|
| 310 | + exit; |
|
| 311 | + } |
|
| 312 | + } |
|
| 313 | + |
|
| 314 | + function isTokenFresh() |
|
| 315 | + { |
|
| 316 | + $db = new DatabaseConnect(); |
|
| 317 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 318 | + |
|
| 319 | + if ($result->num_rows > 0) |
|
| 320 | + { |
|
| 321 | + // output data of each row |
|
| 322 | + while($row = $result->fetch_assoc()) |
|
| 323 | + { |
|
| 324 | + $expiration_date = $row["expiration_date"]; |
|
| 325 | + } |
|
| 326 | + } |
|
| 327 | + else |
|
| 328 | + { |
|
| 329 | + error_log('0 results'); |
|
| 330 | + } |
|
| 331 | + |
|
| 332 | + if($expiration_date <= time()) |
|
| 333 | + { |
|
| 334 | + return FLASE; |
|
| 335 | + } |
|
| 336 | 336 | |
| 337 | - return TRUE; |
|
| 338 | - } |
|
| 339 | - |
|
| 340 | - function refreshToken() |
|
| 341 | - { |
|
| 342 | - $accountCreator = new CreateUser(); |
|
| 343 | - $accountCreator->setAccessToken($this->accessToken); |
|
| 344 | - $accountCreator->setDeviceUid($this->deviceUid); |
|
| 345 | - $accountCreator->setLocation($this->location); |
|
| 346 | - $data = $accountCreator->execute(); |
|
| 347 | - |
|
| 348 | - $access_token = (string)$data[0]['access_token']; |
|
| 349 | - $expiration_date = $data[0]['expiration_date']; |
|
| 350 | - $device_uid = (string)$data[1]; |
|
| 337 | + return TRUE; |
|
| 338 | + } |
|
| 339 | + |
|
| 340 | + function refreshToken() |
|
| 341 | + { |
|
| 342 | + $accountCreator = new CreateUser(); |
|
| 343 | + $accountCreator->setAccessToken($this->accessToken); |
|
| 344 | + $accountCreator->setDeviceUid($this->deviceUid); |
|
| 345 | + $accountCreator->setLocation($this->location); |
|
| 346 | + $data = $accountCreator->execute(); |
|
| 347 | + |
|
| 348 | + $access_token = (string)$data[0]['access_token']; |
|
| 349 | + $expiration_date = $data[0]['expiration_date']; |
|
| 350 | + $device_uid = (string)$data[1]; |
|
| 351 | 351 | |
| 352 | - $db = new DatabaseConnect(); |
|
| 353 | - $result = $db->query("UPDATE accounts |
|
| 352 | + $db = new DatabaseConnect(); |
|
| 353 | + $result = $db->query("UPDATE accounts |
|
| 354 | 354 | SET access_token='" . $access_token . "', |
| 355 | 355 | expiration_date='" . $expiration_date . "' |
| 356 | 356 | WHERE device_uid='" . $device_uid . "'"); |
| 357 | 357 | |
| 358 | - if($result === false){ |
|
| 359 | - error_log("Adding account failed: (" . $db->errno . ") " . $db->error); |
|
| 360 | - } |
|
| 361 | - } |
|
| 358 | + if($result === false){ |
|
| 359 | + error_log("Adding account failed: (" . $db->errno . ") " . $db->error); |
|
| 360 | + } |
|
| 361 | + } |
|
| 362 | 362 | |
| 363 | 363 | |
| 364 | 364 | |
| 365 | - function getAccessToken() |
|
| 366 | - { |
|
| 367 | - $db = new DatabaseConnect(); |
|
| 368 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 365 | + function getAccessToken() |
|
| 366 | + { |
|
| 367 | + $db = new DatabaseConnect(); |
|
| 368 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 369 | 369 | |
| 370 | - $accessToken; |
|
| 370 | + $accessToken; |
|
| 371 | 371 | |
| 372 | - if ($result->num_rows > 0) |
|
| 373 | - { |
|
| 374 | - // output data of each row |
|
| 375 | - while($row = $result->fetch_assoc()) |
|
| 376 | - { |
|
| 377 | - $accessToken = $row['access_token']; |
|
| 378 | - } |
|
| 379 | - } |
|
| 380 | - else |
|
| 381 | - { |
|
| 382 | - error_log('Error: 0 results'); |
|
| 383 | - } |
|
| 384 | - |
|
| 385 | - return $accessToken; |
|
| 386 | - } |
|
| 387 | - |
|
| 388 | - |
|
| 389 | - function getKarma() |
|
| 390 | - { |
|
| 391 | - $accountCreator = new GetKarma(); |
|
| 392 | - $accountCreator->setAccessToken($this->accessToken); |
|
| 393 | - $data = $accountCreator->execute(); |
|
| 372 | + if ($result->num_rows > 0) |
|
| 373 | + { |
|
| 374 | + // output data of each row |
|
| 375 | + while($row = $result->fetch_assoc()) |
|
| 376 | + { |
|
| 377 | + $accessToken = $row['access_token']; |
|
| 378 | + } |
|
| 379 | + } |
|
| 380 | + else |
|
| 381 | + { |
|
| 382 | + error_log('Error: 0 results'); |
|
| 383 | + } |
|
| 384 | + |
|
| 385 | + return $accessToken; |
|
| 386 | + } |
|
| 387 | + |
|
| 388 | + |
|
| 389 | + function getKarma() |
|
| 390 | + { |
|
| 391 | + $accountCreator = new GetKarma(); |
|
| 392 | + $accountCreator->setAccessToken($this->accessToken); |
|
| 393 | + $data = $accountCreator->execute(); |
|
| 394 | 394 | |
| 395 | - return $data["karma"]; |
|
| 396 | - } |
|
| 395 | + return $data["karma"]; |
|
| 396 | + } |
|
| 397 | 397 | |
| 398 | - function hasVoted($postId) |
|
| 399 | - { |
|
| 400 | - $db = new DatabaseConnect(); |
|
| 398 | + function hasVoted($postId) |
|
| 399 | + { |
|
| 400 | + $db = new DatabaseConnect(); |
|
| 401 | 401 | |
| 402 | - $postId = $db->real_escape_string($postId); |
|
| 402 | + $postId = $db->real_escape_string($postId); |
|
| 403 | 403 | |
| 404 | - $result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')"); |
|
| 404 | + $result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')"); |
|
| 405 | 405 | |
| 406 | - if($result === false) |
|
| 407 | - { |
|
| 408 | - $error = db_error(); |
|
| 409 | - echo $error; |
|
| 410 | - error_log("Adding Vote failed: (" . $result->errno . ") " . $result->error); |
|
| 411 | - } |
|
| 412 | - |
|
| 413 | - if($result->num_rows == 0) |
|
| 414 | - { |
|
| 415 | - return FALSE; |
|
| 416 | - } |
|
| 417 | - else |
|
| 418 | - { |
|
| 419 | - return TRUE; |
|
| 420 | - } |
|
| 421 | - } |
|
| 422 | - |
|
| 423 | - function addVoteWithPostIdAndType($postId, $voteType) |
|
| 424 | - { |
|
| 425 | - $db = new DatabaseConnect(); |
|
| 426 | - |
|
| 427 | - $postId = $db->real_escape_string($postId); |
|
| 428 | - $voteType = $db->real_escape_string($voteType); |
|
| 406 | + if($result === false) |
|
| 407 | + { |
|
| 408 | + $error = db_error(); |
|
| 409 | + echo $error; |
|
| 410 | + error_log("Adding Vote failed: (" . $result->errno . ") " . $result->error); |
|
| 411 | + } |
|
| 412 | + |
|
| 413 | + if($result->num_rows == 0) |
|
| 414 | + { |
|
| 415 | + return FALSE; |
|
| 416 | + } |
|
| 417 | + else |
|
| 418 | + { |
|
| 419 | + return TRUE; |
|
| 420 | + } |
|
| 421 | + } |
|
| 422 | + |
|
| 423 | + function addVoteWithPostIdAndType($postId, $voteType) |
|
| 424 | + { |
|
| 425 | + $db = new DatabaseConnect(); |
|
| 426 | + |
|
| 427 | + $postId = $db->real_escape_string($postId); |
|
| 428 | + $voteType = $db->real_escape_string($voteType); |
|
| 429 | 429 | |
| 430 | - if($this->hasVoted($postId)) |
|
| 431 | - { |
|
| 432 | - return "Already voted"; |
|
| 433 | - } |
|
| 430 | + if($this->hasVoted($postId)) |
|
| 431 | + { |
|
| 432 | + return "Already voted"; |
|
| 433 | + } |
|
| 434 | 434 | |
| 435 | - $result = $db->query("INSERT INTO votes (device_uid, postId, type) |
|
| 435 | + $result = $db->query("INSERT INTO votes (device_uid, postId, type) |
|
| 436 | 436 | VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')"); |
| 437 | 437 | |
| 438 | - if($result === false){ |
|
| 439 | - $error = db_error(); |
|
| 440 | - echo $error; |
|
| 441 | - echo "Adding Vote failed: (" . $result->errno . ") " . $result->error; |
|
| 442 | - } |
|
| 443 | - } |
|
| 444 | - |
|
| 445 | - function registerAccount($location) { |
|
| 446 | - $accountCreator = new CreateUser(); |
|
| 447 | - $accountCreator->setLocation($location); |
|
| 448 | - $data = $accountCreator->execute(); |
|
| 438 | + if($result === false){ |
|
| 439 | + $error = db_error(); |
|
| 440 | + echo $error; |
|
| 441 | + echo "Adding Vote failed: (" . $result->errno . ") " . $result->error; |
|
| 442 | + } |
|
| 443 | + } |
|
| 444 | + |
|
| 445 | + function registerAccount($location) { |
|
| 446 | + $accountCreator = new CreateUser(); |
|
| 447 | + $accountCreator->setLocation($location); |
|
| 448 | + $data = $accountCreator->execute(); |
|
| 449 | 449 | |
| 450 | - $access_token = (string)$data[0]['access_token']; |
|
| 451 | - $refresh_token = (string)$data[0]['refresh_token']; |
|
| 452 | - $token_type = (string)$data[0]['token_type']; |
|
| 453 | - $expires_in = $data[0]['expires_in']; |
|
| 454 | - $expiration_date = $data[0]['expiration_date']; |
|
| 455 | - $distinct_id = (string)$data[0]['distinct_id']; |
|
| 456 | - $device_uid = (string)$data[1]; |
|
| 457 | - |
|
| 458 | - $name = $location->cityName; |
|
| 459 | - $lat = $location->lat; |
|
| 460 | - $lng = $location->lng; |
|
| 450 | + $access_token = (string)$data[0]['access_token']; |
|
| 451 | + $refresh_token = (string)$data[0]['refresh_token']; |
|
| 452 | + $token_type = (string)$data[0]['token_type']; |
|
| 453 | + $expires_in = $data[0]['expires_in']; |
|
| 454 | + $expiration_date = $data[0]['expiration_date']; |
|
| 455 | + $distinct_id = (string)$data[0]['distinct_id']; |
|
| 456 | + $device_uid = (string)$data[1]; |
|
| 457 | + |
|
| 458 | + $name = $location->cityName; |
|
| 459 | + $lat = $location->lat; |
|
| 460 | + $lng = $location->lng; |
|
| 461 | 461 | |
| 462 | - $db = new DatabaseConnect(); |
|
| 463 | - $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type, |
|
| 462 | + $db = new DatabaseConnect(); |
|
| 463 | + $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type, |
|
| 464 | 464 | expires_in, expiration_date, distinct_id, device_uid, name, lat, lng) |
| 465 | 465 | VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type . |
| 466 | - "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id . |
|
| 467 | - "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') "); |
|
| 468 | - |
|
| 469 | - $success = TRUE; |
|
| 470 | - if($result === false){ |
|
| 471 | - $error = db_error(); |
|
| 472 | - echo $error; |
|
| 473 | - echo "Adding account failed: (" . $result->errno . ") " . $result->error; |
|
| 474 | - $success = FALSE; |
|
| 475 | - } |
|
| 466 | + "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id . |
|
| 467 | + "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') "); |
|
| 468 | + |
|
| 469 | + $success = TRUE; |
|
| 470 | + if($result === false){ |
|
| 471 | + $error = db_error(); |
|
| 472 | + echo $error; |
|
| 473 | + echo "Adding account failed: (" . $result->errno . ") " . $result->error; |
|
| 474 | + $success = FALSE; |
|
| 475 | + } |
|
| 476 | 476 | |
| 477 | - return $device_uid; |
|
| 478 | - } |
|
| 477 | + return $device_uid; |
|
| 478 | + } |
|
| 479 | 479 | |
| 480 | - function createAccount() |
|
| 481 | - { |
|
| 482 | - $config = parse_ini_file('config/config.ini.php'); |
|
| 483 | - $location = new Location(); |
|
| 484 | - $location->setLat($config['default_lat']); |
|
| 485 | - $location->setLng($config['default_lng']); |
|
| 486 | - $location->setCityName($config['default_location']); |
|
| 480 | + function createAccount() |
|
| 481 | + { |
|
| 482 | + $config = parse_ini_file('config/config.ini.php'); |
|
| 483 | + $location = new Location(); |
|
| 484 | + $location->setLat($config['default_lat']); |
|
| 485 | + $location->setLng($config['default_lng']); |
|
| 486 | + $location->setCityName($config['default_location']); |
|
| 487 | 487 | |
| 488 | - $deviceUid = $this->registerAccount($location); |
|
| 488 | + $deviceUid = $this->registerAccount($location); |
|
| 489 | 489 | |
| 490 | - return $deviceUid; |
|
| 491 | - } |
|
| 490 | + return $deviceUid; |
|
| 491 | + } |
|
| 492 | 492 | } |
| 493 | 493 | \ No newline at end of file |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | { |
| 36 | 36 | $this->refreshToken(); |
| 37 | 37 | } |
| 38 | - $this->accessToken = $this->getAccessToken(); |
|
| 38 | + $this->accessToken = $this->getAccessToken(); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | function isAccountVerified() |
@@ -64,11 +64,11 @@ discard block |
||
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $db = new DatabaseConnect(); |
| 67 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 67 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 68 | 68 | |
| 69 | 69 | $location = new Location(); |
| 70 | 70 | |
| 71 | - if ($result->num_rows > 0) |
|
| 71 | + if($result->num_rows > 0) |
|
| 72 | 72 | { |
| 73 | 73 | // output data of each row |
| 74 | 74 | while($row = $result->fetch_assoc()) |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | } |
| 142 | 142 | else |
| 143 | 143 | { |
| 144 | - error_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name); |
|
| 144 | + error_log('User with JodelDeviceId:' . $this->deviceUid . ' [' . $_SERVER['REMOTE_ADDR'] . '][' . $_SERVER ['HTTP_USER_AGENT'] . '] changed to Location: ' . $name); |
|
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
@@ -153,11 +153,11 @@ discard block |
||
| 153 | 153 | function getLocation() |
| 154 | 154 | { |
| 155 | 155 | $db = new DatabaseConnect(); |
| 156 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 156 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 157 | 157 | |
| 158 | 158 | $location = new Location(); |
| 159 | 159 | |
| 160 | - if ($result->num_rows > 0) |
|
| 160 | + if($result->num_rows > 0) |
|
| 161 | 161 | { |
| 162 | 162 | // output data of each row |
| 163 | 163 | while($row = $result->fetch_assoc()) |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | if(isset($_POST['color'])) |
| 263 | 263 | { |
| 264 | 264 | $color = $_POST['color']; |
| 265 | - switch ($color) { |
|
| 265 | + switch($color) { |
|
| 266 | 266 | case '8ABDB0': |
| 267 | 267 | $color = '8ABDB0'; |
| 268 | 268 | break; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | $db = new DatabaseConnect(); |
| 317 | 317 | $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
| 318 | 318 | |
| 319 | - if ($result->num_rows > 0) |
|
| 319 | + if($result->num_rows > 0) |
|
| 320 | 320 | { |
| 321 | 321 | // output data of each row |
| 322 | 322 | while($row = $result->fetch_assoc()) |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | expiration_date='" . $expiration_date . "' |
| 356 | 356 | WHERE device_uid='" . $device_uid . "'"); |
| 357 | 357 | |
| 358 | - if($result === false){ |
|
| 358 | + if($result === false) { |
|
| 359 | 359 | error_log("Adding account failed: (" . $db->errno . ") " . $db->error); |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -365,11 +365,11 @@ discard block |
||
| 365 | 365 | function getAccessToken() |
| 366 | 366 | { |
| 367 | 367 | $db = new DatabaseConnect(); |
| 368 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 368 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $this->deviceUid . "'"); |
|
| 369 | 369 | |
| 370 | 370 | $accessToken; |
| 371 | 371 | |
| 372 | - if ($result->num_rows > 0) |
|
| 372 | + if($result->num_rows > 0) |
|
| 373 | 373 | { |
| 374 | 374 | // output data of each row |
| 375 | 375 | while($row = $result->fetch_assoc()) |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $result = $db->query("INSERT INTO votes (device_uid, postId, type) |
| 436 | 436 | VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')"); |
| 437 | 437 | |
| 438 | - if($result === false){ |
|
| 438 | + if($result === false) { |
|
| 439 | 439 | $error = db_error(); |
| 440 | 440 | echo $error; |
| 441 | 441 | echo "Adding Vote failed: (" . $result->errno . ") " . $result->error; |
@@ -463,11 +463,11 @@ discard block |
||
| 463 | 463 | $result = $db->query("INSERT INTO accounts (access_token, refresh_token, token_type, |
| 464 | 464 | expires_in, expiration_date, distinct_id, device_uid, name, lat, lng) |
| 465 | 465 | VALUES ('" . $access_token . "','" . $refresh_token . "','" . $token_type . |
| 466 | - "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id . |
|
| 466 | + "','" . $expires_in . "','" . $expiration_date . "','" . $distinct_id . |
|
| 467 | 467 | "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') "); |
| 468 | 468 | |
| 469 | 469 | $success = TRUE; |
| 470 | - if($result === false){ |
|
| 470 | + if($result === false) { |
|
| 471 | 471 | $error = db_error(); |
| 472 | 472 | echo $error; |
| 473 | 473 | echo "Adding account failed: (" . $result->errno . ") " . $result->error; |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | if($location->getLat() == $lat && $location->getLng() == $lng && $location->getCityName() == $name) |
| 88 | 88 | { |
| 89 | 89 | return TRUE; |
| 90 | - } |
|
| 90 | + } |
|
| 91 | 91 | else |
| 92 | 92 | { |
| 93 | 93 | return FALSE; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | if(substr($_GET['city'], 0, 1) === '#') |
| 101 | 101 | { |
| 102 | 102 | return htmlspecialchars($_GET['city']) . " " . $this->location->cityName; |
| 103 | - } |
|
| 103 | + } |
|
| 104 | 104 | else |
| 105 | 105 | { |
| 106 | 106 | $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
@@ -262,7 +262,8 @@ discard block |
||
| 262 | 262 | if(isset($_POST['color'])) |
| 263 | 263 | { |
| 264 | 264 | $color = $_POST['color']; |
| 265 | - switch ($color) { |
|
| 265 | + switch ($color) |
|
| 266 | + { |
|
| 266 | 267 | case '8ABDB0': |
| 267 | 268 | $color = '8ABDB0'; |
| 268 | 269 | break; |
@@ -355,7 +356,8 @@ discard block |
||
| 355 | 356 | expiration_date='" . $expiration_date . "' |
| 356 | 357 | WHERE device_uid='" . $device_uid . "'"); |
| 357 | 358 | |
| 358 | - if($result === false){ |
|
| 359 | + if($result === false) |
|
| 360 | + { |
|
| 359 | 361 | error_log("Adding account failed: (" . $db->errno . ") " . $db->error); |
| 360 | 362 | } |
| 361 | 363 | } |
@@ -435,14 +437,16 @@ discard block |
||
| 435 | 437 | $result = $db->query("INSERT INTO votes (device_uid, postId, type) |
| 436 | 438 | VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')"); |
| 437 | 439 | |
| 438 | - if($result === false){ |
|
| 440 | + if($result === false) |
|
| 441 | + { |
|
| 439 | 442 | $error = db_error(); |
| 440 | 443 | echo $error; |
| 441 | 444 | echo "Adding Vote failed: (" . $result->errno . ") " . $result->error; |
| 442 | 445 | } |
| 443 | 446 | } |
| 444 | 447 | |
| 445 | - function registerAccount($location) { |
|
| 448 | + function registerAccount($location) |
|
| 449 | + { |
|
| 446 | 450 | $accountCreator = new CreateUser(); |
| 447 | 451 | $accountCreator->setLocation($location); |
| 448 | 452 | $data = $accountCreator->execute(); |
@@ -467,7 +471,8 @@ discard block |
||
| 467 | 471 | "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') "); |
| 468 | 472 | |
| 469 | 473 | $success = TRUE; |
| 470 | - if($result === false){ |
|
| 474 | + if($result === false) |
|
| 475 | + { |
|
| 471 | 476 | $error = db_error(); |
| 472 | 477 | echo $error; |
| 473 | 478 | echo "Adding account failed: (" . $result->errno . ") " . $result->error; |
@@ -51,16 +51,16 @@ discard block |
||
| 51 | 51 | { |
| 52 | 52 | $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($city) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
| 53 | 53 | $result = Requests::post($url); |
| 54 | - if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST') |
|
| 54 | + if(json_decode($result->body, TRUE)['status'] == 'ZERO_RESULTS' || json_decode($result->body, TRUE)['status'] == 'INVALID_REQUEST') |
|
| 55 | 55 | { |
| 56 | 56 | error_log('Error locationEquals'); |
| 57 | 57 | return FALSE; |
| 58 | 58 | } |
| 59 | 59 | else |
| 60 | 60 | { |
| 61 | - $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name']; |
|
| 62 | - $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat']; |
|
| 63 | - $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng']; |
|
| 61 | + $name = json_decode($result->body, TRUE)['results']['0']['address_components']['0']['long_name']; |
|
| 62 | + $lat = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lat']; |
|
| 63 | + $lng = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lng']; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | $db = new DatabaseConnect(); |
@@ -105,15 +105,15 @@ discard block |
||
| 105 | 105 | { |
| 106 | 106 | $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . htmlspecialchars($_GET['city']) . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
| 107 | 107 | $result = Requests::post($url); |
| 108 | - if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS' || json_decode($result->body, true)['status'] == 'INVALID_REQUEST') |
|
| 108 | + if(json_decode($result->body, TRUE)['status'] == 'ZERO_RESULTS' || json_decode($result->body, TRUE)['status'] == 'INVALID_REQUEST') |
|
| 109 | 109 | { |
| 110 | 110 | return "0 results"; |
| 111 | 111 | } |
| 112 | 112 | else |
| 113 | 113 | { |
| 114 | - $name = json_decode($result->body, true)['results']['0']['address_components']['0']['long_name']; |
|
| 115 | - $lat = json_decode($result->body, true)['results']['0']['geometry']['location']['lat']; |
|
| 116 | - $lng = json_decode($result->body, true)['results']['0']['geometry']['location']['lng']; |
|
| 114 | + $name = json_decode($result->body, TRUE)['results']['0']['address_components']['0']['long_name']; |
|
| 115 | + $lat = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lat']; |
|
| 116 | + $lng = json_decode($result->body, TRUE)['results']['0']['geometry']['location']['lng']; |
|
| 117 | 117 | |
| 118 | 118 | $location = new Location(); |
| 119 | 119 | $location->setLat($lat); |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | lng='" . $lng . "' |
| 136 | 136 | WHERE access_token='" . $this->accessToken . "'"); |
| 137 | 137 | |
| 138 | - if($result === false) |
|
| 138 | + if($result === FALSE) |
|
| 139 | 139 | { |
| 140 | 140 | echo "Updating location failed: (" . $db->errno . ") " . $db->error; |
| 141 | 141 | } |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | expiration_date='" . $expiration_date . "' |
| 356 | 356 | WHERE device_uid='" . $device_uid . "'"); |
| 357 | 357 | |
| 358 | - if($result === false){ |
|
| 358 | + if($result === FALSE){ |
|
| 359 | 359 | error_log("Adding account failed: (" . $db->errno . ") " . $db->error); |
| 360 | 360 | } |
| 361 | 361 | } |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | |
| 404 | 404 | $result = $db->query("SELECT id FROM votes WHERE (postId = '" . $postId . "' AND device_uid = '" . $this->deviceUid . "')"); |
| 405 | 405 | |
| 406 | - if($result === false) |
|
| 406 | + if($result === FALSE) |
|
| 407 | 407 | { |
| 408 | 408 | $error = db_error(); |
| 409 | 409 | echo $error; |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | $result = $db->query("INSERT INTO votes (device_uid, postId, type) |
| 436 | 436 | VALUES ('" . $this->deviceUid . "','" . $postId . "','" . $voteType . "')"); |
| 437 | 437 | |
| 438 | - if($result === false){ |
|
| 438 | + if($result === FALSE){ |
|
| 439 | 439 | $error = db_error(); |
| 440 | 440 | echo $error; |
| 441 | 441 | echo "Adding Vote failed: (" . $result->errno . ") " . $result->error; |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') "); |
| 468 | 468 | |
| 469 | 469 | $success = TRUE; |
| 470 | - if($result === false){ |
|
| 470 | + if($result === FALSE){ |
|
| 471 | 471 | $error = db_error(); |
| 472 | 472 | echo $error; |
| 473 | 473 | echo "Adding account failed: (" . $result->errno . ") " . $result->error; |
@@ -43,36 +43,36 @@ discard block |
||
| 43 | 43 | |
| 44 | 44 | function isUserBot() |
| 45 | 45 | { |
| 46 | - preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches); |
|
| 46 | + preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches); |
|
| 47 | 47 | |
| 48 | - return (isset($matches[0])) ? true : false; |
|
| 48 | + return (isset($matches[0])) ? true : false; |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | function configPropertyExists($config, $property) |
| 52 | 52 | { |
| 53 | - if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx') |
|
| 54 | - { |
|
| 55 | - return FALSE; |
|
| 56 | - } |
|
| 57 | - else |
|
| 58 | - { |
|
| 59 | - return TRUE; |
|
| 60 | - } |
|
| 53 | + if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx') |
|
| 54 | + { |
|
| 55 | + return FALSE; |
|
| 56 | + } |
|
| 57 | + else |
|
| 58 | + { |
|
| 59 | + return TRUE; |
|
| 60 | + } |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | function isDeviceUidInDatabase($deviceUid) |
| 64 | 64 | { |
| 65 | - $db = new DatabaseConnect(); |
|
| 66 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'"); |
|
| 67 | - |
|
| 68 | - if ($result->num_rows > 0) |
|
| 69 | - { |
|
| 70 | - return TRUE; |
|
| 71 | - } |
|
| 72 | - else |
|
| 73 | - { |
|
| 74 | - return FALSE; |
|
| 75 | - } |
|
| 65 | + $db = new DatabaseConnect(); |
|
| 66 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'"); |
|
| 67 | + |
|
| 68 | + if ($result->num_rows > 0) |
|
| 69 | + { |
|
| 70 | + return TRUE; |
|
| 71 | + } |
|
| 72 | + else |
|
| 73 | + { |
|
| 74 | + return FALSE; |
|
| 75 | + } |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | //Check if it's a Spider or Google Bot |
@@ -99,14 +99,14 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | if(configPropertyExists($config, 'karmaDeviceUid')) |
| 102 | - { |
|
| 103 | - $jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']); |
|
| 104 | - } |
|
| 105 | - else |
|
| 106 | - { |
|
| 107 | - error_log("No Karma deviceUid set in config file"); |
|
| 102 | + { |
|
| 103 | + $jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']); |
|
| 104 | + } |
|
| 105 | + else |
|
| 106 | + { |
|
| 107 | + error_log("No Karma deviceUid set in config file"); |
|
| 108 | 108 | $jodelAccountForKarma = new JodelAccount($deviceUid); |
| 109 | - } |
|
| 109 | + } |
|
| 110 | 110 | |
| 111 | 111 | $newPositionStatus = $jodelAccountForView->location->getCityName(); |
| 112 | 112 | |
@@ -153,14 +153,14 @@ discard block |
||
| 153 | 153 | { |
| 154 | 154 | $jodelAccountForKarma->votePostId($_GET['postId'], $_GET['vote']); |
| 155 | 155 | if(isset($_GET['getPostDetails']) && isset($_GET['getPostDetails'])) |
| 156 | - { |
|
| 157 | - header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId'])); |
|
| 158 | - } |
|
| 159 | - else |
|
| 160 | - { |
|
| 161 | - header("Location: index.php#postId-" . htmlspecialchars($_GET['postId'])); |
|
| 162 | - } |
|
| 163 | - die(); |
|
| 156 | + { |
|
| 157 | + header('Location: index.php?getPostDetails=true&postId=' . htmlspecialchars($_GET['postId_parent']) . '#postId-' . htmlspecialchars($_GET['postId'])); |
|
| 158 | + } |
|
| 159 | + else |
|
| 160 | + { |
|
| 161 | + header("Location: index.php#postId-" . htmlspecialchars($_GET['postId'])); |
|
| 162 | + } |
|
| 163 | + die(); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | //SendJodel |
@@ -205,32 +205,32 @@ discard block |
||
| 205 | 205 | if(!array_key_exists(0, $posts)) |
| 206 | 206 | { |
| 207 | 207 | $posts[0] = array( |
| 208 | - "post_id" => "0", |
|
| 209 | - "discovered_by" => 0, |
|
| 210 | - "message" => "Not found", |
|
| 211 | - "created_at" => "2017-02-11T16:44:50.385Z", |
|
| 212 | - "updated_at" => "2017-02-11T16:44:50.385Z", |
|
| 213 | - "pin_count" => 0, |
|
| 214 | - "color" => "FFBA00", |
|
| 215 | - "got_thanks" => FALSE, |
|
| 216 | - "post_own" => "friend", |
|
| 217 | - "discovered" => 0, |
|
| 218 | - "distance" => 9, |
|
| 219 | - "vote_count" => 0, |
|
| 220 | - "location" => |
|
| 221 | - array("name" => "Berlin", |
|
| 222 | - "loc_coordinates" => |
|
| 223 | - array( |
|
| 224 | - "lat" => 0, |
|
| 225 | - "lng" => 0 |
|
| 226 | - ), |
|
| 227 | - "loc_accuracy" => 0, |
|
| 228 | - "country" => "", |
|
| 229 | - "city" => "", |
|
| 230 | - ), |
|
| 231 | - "tags" => |
|
| 232 | - array(), |
|
| 233 | - "user_handle" => "0" |
|
| 208 | + "post_id" => "0", |
|
| 209 | + "discovered_by" => 0, |
|
| 210 | + "message" => "Not found", |
|
| 211 | + "created_at" => "2017-02-11T16:44:50.385Z", |
|
| 212 | + "updated_at" => "2017-02-11T16:44:50.385Z", |
|
| 213 | + "pin_count" => 0, |
|
| 214 | + "color" => "FFBA00", |
|
| 215 | + "got_thanks" => FALSE, |
|
| 216 | + "post_own" => "friend", |
|
| 217 | + "discovered" => 0, |
|
| 218 | + "distance" => 9, |
|
| 219 | + "vote_count" => 0, |
|
| 220 | + "location" => |
|
| 221 | + array("name" => "Berlin", |
|
| 222 | + "loc_coordinates" => |
|
| 223 | + array( |
|
| 224 | + "lat" => 0, |
|
| 225 | + "lng" => 0 |
|
| 226 | + ), |
|
| 227 | + "loc_accuracy" => 0, |
|
| 228 | + "country" => "", |
|
| 229 | + "city" => "", |
|
| 230 | + ), |
|
| 231 | + "tags" => |
|
| 232 | + array(), |
|
| 233 | + "user_handle" => "0" |
|
| 234 | 234 | ); |
| 235 | 235 | } |
| 236 | 236 | } |
@@ -239,32 +239,32 @@ discard block |
||
| 239 | 239 | $posts = array(); |
| 240 | 240 | $posts[0] = |
| 241 | 241 | array( |
| 242 | - "post_id" => "0", |
|
| 243 | - "discovered_by" => 0, |
|
| 244 | - "message" => "Bad Request", |
|
| 245 | - "created_at" => "2017-02-11T16:44:50.385Z", |
|
| 246 | - "updated_at" => "2017-02-11T16:44:50.385Z", |
|
| 247 | - "pin_count" => 0, |
|
| 248 | - "color" => "FFBA00", |
|
| 249 | - "got_thanks" => FALSE, |
|
| 250 | - "post_own" => "friend", |
|
| 251 | - "discovered" => 0, |
|
| 252 | - "distance" => 9, |
|
| 253 | - "vote_count" => 0, |
|
| 254 | - "location" => |
|
| 255 | - array("name" => "Berlin", |
|
| 256 | - "loc_coordinates" => |
|
| 257 | - array( |
|
| 258 | - "lat" => 0, |
|
| 259 | - "lng" => 0 |
|
| 260 | - ), |
|
| 261 | - "loc_accuracy" => 0, |
|
| 262 | - "country" => "", |
|
| 263 | - "city" => "", |
|
| 264 | - ), |
|
| 265 | - "tags" => |
|
| 266 | - array(), |
|
| 267 | - "user_handle" => "0" |
|
| 242 | + "post_id" => "0", |
|
| 243 | + "discovered_by" => 0, |
|
| 244 | + "message" => "Bad Request", |
|
| 245 | + "created_at" => "2017-02-11T16:44:50.385Z", |
|
| 246 | + "updated_at" => "2017-02-11T16:44:50.385Z", |
|
| 247 | + "pin_count" => 0, |
|
| 248 | + "color" => "FFBA00", |
|
| 249 | + "got_thanks" => FALSE, |
|
| 250 | + "post_own" => "friend", |
|
| 251 | + "discovered" => 0, |
|
| 252 | + "distance" => 9, |
|
| 253 | + "vote_count" => 0, |
|
| 254 | + "location" => |
|
| 255 | + array("name" => "Berlin", |
|
| 256 | + "loc_coordinates" => |
|
| 257 | + array( |
|
| 258 | + "lat" => 0, |
|
| 259 | + "lng" => 0 |
|
| 260 | + ), |
|
| 261 | + "loc_accuracy" => 0, |
|
| 262 | + "country" => "", |
|
| 263 | + "city" => "", |
|
| 264 | + ), |
|
| 265 | + "tags" => |
|
| 266 | + array(), |
|
| 267 | + "user_handle" => "0" |
|
| 268 | 268 | ); |
| 269 | 269 | |
| 270 | 270 | |
