@@ -43,7 +43,8 @@ discard block |
||
43 | 43 | if ($result->num_rows > 0) |
44 | 44 | { |
45 | 45 | // output data of each row |
46 | - while($row = $result->fetch_assoc()) { |
|
46 | + while($row = $result->fetch_assoc()) |
|
47 | + { |
|
47 | 48 | //$access_token = $row["access_token"]; |
48 | 49 | $expiration_date = $row["expiration_date"]; |
49 | 50 | $deviceUid = $row["device_uid"]; |
@@ -55,7 +56,8 @@ discard block |
||
55 | 56 | echo '0 results'; |
56 | 57 | } |
57 | 58 | |
58 | - if($expiration_date <= time()) { |
|
59 | + if($expiration_date <= time()) |
|
60 | + { |
|
59 | 61 | $accountCreator = new CreateUser(); |
60 | 62 | $accountCreator->setAccessToken($access_token);//$accountData->getAccessToken()); |
61 | 63 | $accountCreator->setDeviceUid($deviceUid); |
@@ -72,7 +74,8 @@ discard block |
||
72 | 74 | expiration_date='" . $expiration_date . "' |
73 | 75 | WHERE device_uid='" . $device_uid . "'"); |
74 | 76 | |
75 | - if($result === false){ |
|
77 | + if($result === false) |
|
78 | + { |
|
76 | 79 | echo "Adding account failed: (" . $db->errno . ") " . $db->error; |
77 | 80 | } |
78 | 81 | } |
@@ -88,7 +91,8 @@ discard block |
||
88 | 91 | if ($result->num_rows > 0) |
89 | 92 | { |
90 | 93 | // output data of each row |
91 | - while($row = $result->fetch_assoc()) { |
|
94 | + while($row = $result->fetch_assoc()) |
|
95 | + { |
|
92 | 96 | //$access_token = $row["access_token"]; |
93 | 97 | $expiration_date = $row["expiration_date"]; |
94 | 98 | $deviceUid = $row["device_uid"]; |
@@ -100,7 +104,8 @@ discard block |
||
100 | 104 | echo '0 results'; |
101 | 105 | } |
102 | 106 | |
103 | - if($expiration_date <= time()) { |
|
107 | + if($expiration_date <= time()) |
|
108 | + { |
|
104 | 109 | $accountCreator = new CreateUser(); |
105 | 110 | $accountCreator->setAccessToken($access_token);//$accountData->getAccessToken()); |
106 | 111 | $accountCreator->setDeviceUid($deviceUid); |
@@ -117,7 +122,8 @@ discard block |
||
117 | 122 | expiration_date='" . $expiration_date . "' |
118 | 123 | WHERE device_uid='" . $device_uid . "'"); |
119 | 124 | |
120 | - if($result === false){ |
|
125 | + if($result === false) |
|
126 | + { |
|
121 | 127 | echo "Adding account failed: (" . $db->errno . ") " . $db->error; |
122 | 128 | } |
123 | 129 | } |
@@ -135,7 +141,8 @@ discard block |
||
135 | 141 | if ($result->num_rows > 0) |
136 | 142 | { |
137 | 143 | // output data of each row |
138 | - while($row = $result->fetch_assoc()) { |
|
144 | + while($row = $result->fetch_assoc()) |
|
145 | + { |
|
139 | 146 | //$access_token = $row["access_token"]; |
140 | 147 | $expiration_date = $row["expiration_date"]; |
141 | 148 | $deviceUid = $row["device_uid"]; |
@@ -147,7 +154,8 @@ discard block |
||
147 | 154 | echo '0 results'; |
148 | 155 | } |
149 | 156 | |
150 | - if($expiration_date <= time()) { |
|
157 | + if($expiration_date <= time()) |
|
158 | + { |
|
151 | 159 | $accountCreator = new CreateUser(); |
152 | 160 | $accountCreator->setAccessToken($access_token); |
153 | 161 | $accountCreator->setDeviceUid($deviceUid); |
@@ -164,7 +172,8 @@ discard block |
||
164 | 172 | expiration_date='" . $expiration_date . "' |
165 | 173 | WHERE device_uid='" . $device_uid . "'"); |
166 | 174 | |
167 | - if($result === false){ |
|
175 | + if($result === false) |
|
176 | + { |
|
168 | 177 | echo "Adding account failed: (" . $db->errno . ") " . $db->error; |
169 | 178 | } |
170 | 179 | } |
@@ -319,7 +328,8 @@ discard block |
||
319 | 328 | $result = $db->query("INSERT INTO votes (device_uid, postId, type) |
320 | 329 | VALUES ('" . $device_uid . "','" . $postId . "','" . $voteType . "')"); |
321 | 330 | |
322 | - if($result === false){ |
|
331 | + if($result === false) |
|
332 | + { |
|
323 | 333 | $error = db_error(); |
324 | 334 | echo $error; |
325 | 335 | echo "Adding Vote failed: (" . $result->errno . ") " . $result->error; |
@@ -327,7 +337,8 @@ discard block |
||
327 | 337 | |
328 | 338 | } |
329 | 339 | |
330 | -function registerAccount(Location $location) { |
|
340 | +function registerAccount(Location $location) |
|
341 | +{ |
|
331 | 342 | $accountCreator = new CreateUser(); |
332 | 343 | $accountCreator->setLocation($location); |
333 | 344 | $data = $accountCreator->execute(); |
@@ -352,7 +363,8 @@ discard block |
||
352 | 363 | "','" . $device_uid . "','" . $name . "','" . $lat . "','" . $lng . "') "); |
353 | 364 | |
354 | 365 | $success = TRUE; |
355 | - if($result === false){ |
|
366 | + if($result === false) |
|
367 | + { |
|
356 | 368 | $error = db_error(); |
357 | 369 | echo $error; |
358 | 370 | echo "Adding account failed: (" . $result->errno . ") " . $result->error; |
@@ -363,7 +375,7 @@ discard block |
||
363 | 375 | } |
364 | 376 | |
365 | 377 | function getPosts($lastPostId, $accessToken, $url, $version = 'v2') |
366 | -{ |
|
378 | +{ |
|
367 | 379 | $accountCreator = new GetPosts(); |
368 | 380 | $accountCreator->setLastPostId($lastPostId); |
369 | 381 | $accountCreator->setAccessToken($accessToken); |
@@ -414,7 +426,8 @@ discard block |
||
414 | 426 | } |
415 | 427 | |
416 | 428 | function jodelToHtml($post, $view = 'time', $isDetailedView = FALSE) |
417 | -{ //ToDO |
|
429 | +{ |
|
430 | +//ToDO |
|
418 | 431 | //Replace # with link |
419 | 432 | //preg_replace('~(\#)([^\s!,. /()"\'?]+)~', '<a href="tag/$2">#$2</a>', $text); |
420 | 433 | |
@@ -464,10 +477,12 @@ discard block |
||
464 | 477 | <article id ="postId-<?php echo $post["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $post["color"];?>;"> |
465 | 478 | <content> |
466 | 479 | <?php |
467 | - if(isset($post["image_url"])) { |
|
480 | + if(isset($post["image_url"])) |
|
481 | + { |
|
468 | 482 | echo '<img src="' . $post["image_url"] . '">'; |
469 | 483 | } |
470 | - else { |
|
484 | + else |
|
485 | + { |
|
471 | 486 | echo str_replace(' ', ' ', nl2br(htmlspecialchars($post["message"]))); |
472 | 487 | } |
473 | 488 | ?> |
@@ -475,11 +490,13 @@ discard block |
||
475 | 490 | <aside> |
476 | 491 | <?php |
477 | 492 | if($isDetailedView) |
478 | - {?> |
|
493 | + { |
|
494 | +?> |
|
479 | 495 | <a href="index.php?vote=up&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>"> |
480 | 496 | <?php } |
481 | - else |
|
482 | - {?> |
|
497 | +else |
|
498 | + { |
|
499 | +?> |
|
483 | 500 | <a href="index.php?vote=up&postID=<?php echo $post['post_id'];?>"> |
484 | 501 | <?php } ?> |
485 | 502 | <i class="fa fa-angle-up fa-3x"></i> |
@@ -488,11 +505,13 @@ discard block |
||
488 | 505 | <?php echo $post["vote_count"];?><br /> |
489 | 506 | <?php |
490 | 507 | if($isDetailedView) |
491 | - {?> |
|
508 | + { |
|
509 | +?> |
|
492 | 510 | <a href="index.php?vote=down&getPostDetails=true&postID=<?php echo $post['post_id'];?>&postID_parent=<?php echo htmlspecialchars($_GET['postID']);?>"> |
493 | 511 | <?php } |
494 | - else |
|
495 | - {?> |
|
512 | +else |
|
513 | + { |
|
514 | +?> |
|
496 | 515 | <a href="index.php?vote=down&postID=<?php echo $post['post_id'];?>"> |
497 | 516 | <?php } ?> |
498 | 517 | <i class="fa fa-angle-down fa-3x"></i> |
@@ -510,13 +529,19 @@ discard block |
||
510 | 529 | </span> |
511 | 530 | </td> |
512 | 531 | <td class="comments"> |
513 | - <?php if(!$isDetailedView) {?> |
|
532 | + <?php if(!$isDetailedView) |
|
533 | +{ |
|
534 | +?> |
|
514 | 535 | <span data-tooltip="Comments"> |
515 | 536 | <a href="index.php?getPostDetails=true&view=<?php echo $view;?>&postID=<?php echo $post["post_id"];?>"> |
516 | 537 | <i class="fa fa-commenting-o"></i> |
517 | - <?php if(array_key_exists("child_count", $post)) { |
|
538 | + <?php if(array_key_exists("child_count", $post)) |
|
539 | +{ |
|
518 | 540 | echo $post["child_count"]; |
519 | - } else echo "0"; |
|
541 | + } |
|
542 | + else { |
|
543 | + echo "0"; |
|
544 | + } |
|
520 | 545 | ?> |
521 | 546 | </a> |
522 | 547 | </span> |