@@ -32,6 +32,10 @@ |
||
| 32 | 32 | { |
| 33 | 33 | return $this->random_str(64, 'abcdef0123456789'); |
| 34 | 34 | } |
| 35 | + |
|
| 36 | + /** |
|
| 37 | + * @param integer $length |
|
| 38 | + */ |
|
| 35 | 39 | function random_str($length, $keyspace = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ') |
| 36 | 40 | { |
| 37 | 41 | $str = ''; |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | } |
| 48 | 48 | function getPayload() |
| 49 | 49 | { |
| 50 | - if(!isset($this->deviceUid)) |
|
| 50 | + if (!isset($this->deviceUid)) |
|
| 51 | 51 | { |
| 52 | 52 | $this->setDeviceUid($this->generateDeviceUid()); |
| 53 | 53 | } |
@@ -226,6 +226,7 @@ discard block |
||
| 226 | 226 | */ |
| 227 | 227 | /** |
| 228 | 228 | * Send a GET request |
| 229 | + * @param string $url |
|
| 229 | 230 | */ |
| 230 | 231 | public static function get($url, $headers = array(), $options = array()) { |
| 231 | 232 | return self::request($url, $headers, null, self::GET, $options); |
@@ -263,12 +264,14 @@ discard block |
||
| 263 | 264 | */ |
| 264 | 265 | /** |
| 265 | 266 | * Send a POST request |
| 267 | + * @param string $url |
|
| 266 | 268 | */ |
| 267 | 269 | public static function post($url, $headers = array(), $data = array(), $options = array()) { |
| 268 | 270 | return self::request($url, $headers, $data, self::POST, $options); |
| 269 | 271 | } |
| 270 | 272 | /** |
| 271 | 273 | * Send a PUT request |
| 274 | + * @param string $url |
|
| 272 | 275 | */ |
| 273 | 276 | public static function put($url, $headers = array(), $data = array(), $options = array()) { |
| 274 | 277 | return self::request($url, $headers, $data, self::PUT, $options); |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | * @return string Default certificate path. |
| 534 | 534 | */ |
| 535 | 535 | public static function get_certificate_path() { |
| 536 | - if ( ! empty( Requests::$certificate_path ) ) { |
|
| 536 | + if (!empty(Requests::$certificate_path)) { |
|
| 537 | 537 | return Requests::$certificate_path; |
| 538 | 538 | } |
| 539 | 539 | |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | * |
| 546 | 546 | * @param string $path Certificate path, pointing to a PEM file. |
| 547 | 547 | */ |
| 548 | - public static function set_certificate_path( $path ) { |
|
| 548 | + public static function set_certificate_path($path) { |
|
| 549 | 549 | Requests::$certificate_path = $path; |
| 550 | 550 | } |
| 551 | 551 | |
@@ -655,8 +655,8 @@ discard block |
||
| 655 | 655 | if (empty($matches)) { |
| 656 | 656 | throw new Requests_Exception('Response could not be parsed', 'noversion', $headers); |
| 657 | 657 | } |
| 658 | - $return->protocol_version = (float) $matches[1]; |
|
| 659 | - $return->status_code = (int) $matches[2]; |
|
| 658 | + $return->protocol_version = (float)$matches[1]; |
|
| 659 | + $return->status_code = (int)$matches[2]; |
|
| 660 | 660 | if ($return->status_code >= 200 && $return->status_code < 300) { |
| 661 | 661 | $return->success = true; |
| 662 | 662 | } |
@@ -759,7 +759,7 @@ discard block |
||
| 759 | 759 | $encoded = $data; |
| 760 | 760 | |
| 761 | 761 | while (true) { |
| 762 | - $is_chunked = (bool) preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches); |
|
| 762 | + $is_chunked = (bool)preg_match('/^([0-9a-f]+)(?:;(?:[\w-]*)(?:=(?:(?:[\w-]*)*|"(?:[^\r\n])*"))?)*\r\n/i', $encoded, $matches); |
|
| 763 | 763 | if (!$is_chunked) { |
| 764 | 764 | // Looks like it's not chunked after all |
| 765 | 765 | return $data; |
@@ -869,17 +869,17 @@ discard block |
||
| 869 | 869 | $i = 10; |
| 870 | 870 | $flg = ord(substr($gzData, 3, 1)); |
| 871 | 871 | if ($flg > 0) { |
| 872 | - if ($flg & 4) { |
|
| 872 | + if ($flg&4) { |
|
| 873 | 873 | list($xlen) = unpack('v', substr($gzData, $i, 2)); |
| 874 | 874 | $i = $i + 2 + $xlen; |
| 875 | 875 | } |
| 876 | - if ($flg & 8) { |
|
| 876 | + if ($flg&8) { |
|
| 877 | 877 | $i = strpos($gzData, "\0", $i) + 1; |
| 878 | 878 | } |
| 879 | - if ($flg & 16) { |
|
| 879 | + if ($flg&16) { |
|
| 880 | 880 | $i = strpos($gzData, "\0", $i) + 1; |
| 881 | 881 | } |
| 882 | - if ($flg & 2) { |
|
| 882 | + if ($flg&2) { |
|
| 883 | 883 | $i = $i + 2; |
| 884 | 884 | } |
| 885 | 885 | } |
@@ -927,7 +927,7 @@ discard block |
||
| 927 | 927 | // If the file has been compressed on the fly, 0x08 bit is set of |
| 928 | 928 | // the general purpose field. We can use this to differentiate |
| 929 | 929 | // between a compressed document, and a ZIP file |
| 930 | - $zip_compressed_on_the_fly = (0x08 == (0x08 & $general_purpose_flag)); |
|
| 930 | + $zip_compressed_on_the_fly = (0x08 == (0x08&$general_purpose_flag)); |
|
| 931 | 931 | |
| 932 | 932 | if (!$zip_compressed_on_the_fly) { |
| 933 | 933 | // Don't attempt to decode a compressed zip file |
@@ -357,7 +357,7 @@ |
||
| 357 | 357 | * @param int $delta |
| 358 | 358 | * @param int $numpoints |
| 359 | 359 | * @param bool $firsttime |
| 360 | - * @return int New bias |
|
| 360 | + * @return double New bias |
|
| 361 | 361 | */ |
| 362 | 362 | protected static function adapt($delta, $numpoints, $firsttime) { |
| 363 | 363 | # function adapt(delta,numpoints,firsttime): |
@@ -145,26 +145,26 @@ discard block |
||
| 145 | 145 | $value = ord($input[$position]); |
| 146 | 146 | |
| 147 | 147 | // One byte sequence: |
| 148 | - if ((~$value & 0x80) === 0x80) { |
|
| 148 | + if ((~$value&0x80) === 0x80) { |
|
| 149 | 149 | $character = $value; |
| 150 | 150 | $length = 1; |
| 151 | 151 | $remaining = 0; |
| 152 | 152 | } |
| 153 | 153 | // Two byte sequence: |
| 154 | - elseif (($value & 0xE0) === 0xC0) { |
|
| 155 | - $character = ($value & 0x1F) << 6; |
|
| 154 | + elseif (($value&0xE0) === 0xC0) { |
|
| 155 | + $character = ($value&0x1F) << 6; |
|
| 156 | 156 | $length = 2; |
| 157 | 157 | $remaining = 1; |
| 158 | 158 | } |
| 159 | 159 | // Three byte sequence: |
| 160 | - elseif (($value & 0xF0) === 0xE0) { |
|
| 161 | - $character = ($value & 0x0F) << 12; |
|
| 160 | + elseif (($value&0xF0) === 0xE0) { |
|
| 161 | + $character = ($value&0x0F) << 12; |
|
| 162 | 162 | $length = 3; |
| 163 | 163 | $remaining = 2; |
| 164 | 164 | } |
| 165 | 165 | // Four byte sequence: |
| 166 | - elseif (($value & 0xF8) === 0xF0) { |
|
| 167 | - $character = ($value & 0x07) << 18; |
|
| 166 | + elseif (($value&0xF8) === 0xF0) { |
|
| 167 | + $character = ($value&0x07) << 18; |
|
| 168 | 168 | $length = 4; |
| 169 | 169 | $remaining = 3; |
| 170 | 170 | } |
@@ -181,11 +181,11 @@ discard block |
||
| 181 | 181 | $value = ord($input[$position]); |
| 182 | 182 | |
| 183 | 183 | // If it is invalid, count the sequence as invalid and reprocess the current byte: |
| 184 | - if (($value & 0xC0) !== 0x80) { |
|
| 184 | + if (($value&0xC0) !== 0x80) { |
|
| 185 | 185 | throw new Requests_Exception('Invalid Unicode codepoint', 'idna.invalidcodepoint', $character); |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - $character |= ($value & 0x3F) << (--$remaining * 6); |
|
| 188 | + $character |= ($value&0x3F) << (--$remaining * 6); |
|
| 189 | 189 | } |
| 190 | 190 | $position--; |
| 191 | 191 | } |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | || $length > 3 && $character <= 0xFFFF |
| 198 | 198 | // Outside of range of ucschar codepoints |
| 199 | 199 | // Noncharacters |
| 200 | - || ($character & 0xFFFE) === 0xFFFE |
|
| 200 | + || ($character&0xFFFE) === 0xFFFE |
|
| 201 | 201 | || $character >= 0xFDD0 && $character <= 0xFDEF |
| 202 | 202 | || ( |
| 203 | 203 | // Everything else not in ucschar |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | * |
| 250 | 250 | * Returns false if $base is not absolute, otherwise an IRI. |
| 251 | 251 | * |
| 252 | - * @param IRI|string $base (Absolute) Base IRI |
|
| 252 | + * @param string $base (Absolute) Base IRI |
|
| 253 | 253 | * @param IRI|string $relative Relative IRI |
| 254 | 254 | * @return IRI|false |
| 255 | 255 | */ |
@@ -984,6 +984,7 @@ discard block |
||
| 984 | 984 | * Convert an IRI to a URI (or parts thereof) |
| 985 | 985 | * |
| 986 | 986 | * @param string|bool IRI to convert (or false from {@see get_iri}) |
| 987 | + * @param false|string $string |
|
| 987 | 988 | * @return string|false URI if IRI is valid, false otherwise. |
| 988 | 989 | */ |
| 989 | 990 | protected function to_uri($string) { |
@@ -442,20 +442,20 @@ discard block |
||
| 442 | 442 | |
| 443 | 443 | // No one byte sequences are valid due to the while. |
| 444 | 444 | // Two byte sequence: |
| 445 | - if (($value & 0xE0) === 0xC0) { |
|
| 446 | - $character = ($value & 0x1F) << 6; |
|
| 445 | + if (($value&0xE0) === 0xC0) { |
|
| 446 | + $character = ($value&0x1F) << 6; |
|
| 447 | 447 | $length = 2; |
| 448 | 448 | $remaining = 1; |
| 449 | 449 | } |
| 450 | 450 | // Three byte sequence: |
| 451 | - elseif (($value & 0xF0) === 0xE0) { |
|
| 452 | - $character = ($value & 0x0F) << 12; |
|
| 451 | + elseif (($value&0xF0) === 0xE0) { |
|
| 452 | + $character = ($value&0x0F) << 12; |
|
| 453 | 453 | $length = 3; |
| 454 | 454 | $remaining = 2; |
| 455 | 455 | } |
| 456 | 456 | // Four byte sequence: |
| 457 | - elseif (($value & 0xF8) === 0xF0) { |
|
| 458 | - $character = ($value & 0x07) << 18; |
|
| 457 | + elseif (($value&0xF8) === 0xF0) { |
|
| 458 | + $character = ($value&0x07) << 18; |
|
| 459 | 459 | $length = 4; |
| 460 | 460 | $remaining = 3; |
| 461 | 461 | } |
@@ -472,8 +472,8 @@ discard block |
||
| 472 | 472 | $value = ord($string[$position]); |
| 473 | 473 | |
| 474 | 474 | // Check that the byte is valid, then add it to the character: |
| 475 | - if (($value & 0xC0) === 0x80) { |
|
| 476 | - $character |= ($value & 0x3F) << (--$remaining * 6); |
|
| 475 | + if (($value&0xC0) === 0x80) { |
|
| 476 | + $character |= ($value&0x3F) << (--$remaining * 6); |
|
| 477 | 477 | } |
| 478 | 478 | // If it is invalid, count the sequence as invalid and reprocess the current byte: |
| 479 | 479 | else { |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | || $length > 3 && $character <= 0xFFFF |
| 500 | 500 | // Outside of range of ucschar codepoints |
| 501 | 501 | // Noncharacters |
| 502 | - || ($character & 0xFFFE) === 0xFFFE |
|
| 502 | + || ($character&0xFFFE) === 0xFFFE |
|
| 503 | 503 | || $character >= 0xFDD0 && $character <= 0xFDEF |
| 504 | 504 | || ( |
| 505 | 505 | // Everything else not in ucschar |
@@ -569,20 +569,20 @@ discard block |
||
| 569 | 569 | $length = 1; |
| 570 | 570 | } |
| 571 | 571 | // Two byte sequence: |
| 572 | - elseif (($value & 0xE0) === 0xC0) { |
|
| 573 | - $character = ($value & 0x1F) << 6; |
|
| 572 | + elseif (($value&0xE0) === 0xC0) { |
|
| 573 | + $character = ($value&0x1F) << 6; |
|
| 574 | 574 | $length = 2; |
| 575 | 575 | $remaining = 1; |
| 576 | 576 | } |
| 577 | 577 | // Three byte sequence: |
| 578 | - elseif (($value & 0xF0) === 0xE0) { |
|
| 579 | - $character = ($value & 0x0F) << 12; |
|
| 578 | + elseif (($value&0xF0) === 0xE0) { |
|
| 579 | + $character = ($value&0x0F) << 12; |
|
| 580 | 580 | $length = 3; |
| 581 | 581 | $remaining = 2; |
| 582 | 582 | } |
| 583 | 583 | // Four byte sequence: |
| 584 | - elseif (($value & 0xF8) === 0xF0) { |
|
| 585 | - $character = ($value & 0x07) << 18; |
|
| 584 | + elseif (($value&0xF8) === 0xF0) { |
|
| 585 | + $character = ($value&0x07) << 18; |
|
| 586 | 586 | $length = 4; |
| 587 | 587 | $remaining = 3; |
| 588 | 588 | } |
@@ -595,9 +595,9 @@ discard block |
||
| 595 | 595 | // Continuation byte: |
| 596 | 596 | else { |
| 597 | 597 | // Check that the byte is valid, then add it to the character: |
| 598 | - if (($value & 0xC0) === 0x80) { |
|
| 598 | + if (($value&0xC0) === 0x80) { |
|
| 599 | 599 | $remaining--; |
| 600 | - $character |= ($value & 0x3F) << ($remaining * 6); |
|
| 600 | + $character |= ($value&0x3F) << ($remaining * 6); |
|
| 601 | 601 | } |
| 602 | 602 | // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence: |
| 603 | 603 | else { |
@@ -621,7 +621,7 @@ discard block |
||
| 621 | 621 | || $character < 0x2D |
| 622 | 622 | || $character > 0xEFFFD |
| 623 | 623 | // Noncharacters |
| 624 | - || ($character & 0xFFFE) === 0xFFFE |
|
| 624 | + || ($character&0xFFFE) === 0xFFFE |
|
| 625 | 625 | || $character >= 0xFDD0 && $character <= 0xFDEF |
| 626 | 626 | // Everything else not in iunreserved (this is all BMP) |
| 627 | 627 | || $character === 0x2F |
@@ -731,7 +731,7 @@ discard block |
||
| 731 | 731 | return $return; |
| 732 | 732 | } |
| 733 | 733 | |
| 734 | - $parsed = $this->parse_iri((string) $iri); |
|
| 734 | + $parsed = $this->parse_iri((string)$iri); |
|
| 735 | 735 | |
| 736 | 736 | $return = $this->set_scheme($parsed['scheme']) |
| 737 | 737 | && $this->set_authority($parsed['authority']) |
@@ -909,7 +909,7 @@ discard block |
||
| 909 | 909 | } |
| 910 | 910 | |
| 911 | 911 | if (strspn($port, '0123456789') === strlen($port)) { |
| 912 | - $this->port = (int) $port; |
|
| 912 | + $this->port = (int)$port; |
|
| 913 | 913 | $this->scheme_normalization(); |
| 914 | 914 | return true; |
| 915 | 915 | } |
@@ -930,10 +930,10 @@ discard block |
||
| 930 | 930 | $cache = array(); |
| 931 | 931 | } |
| 932 | 932 | |
| 933 | - $ipath = (string) $ipath; |
|
| 933 | + $ipath = (string)$ipath; |
|
| 934 | 934 | |
| 935 | 935 | if (isset($cache[$ipath])) { |
| 936 | - $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)]; |
|
| 936 | + $this->ipath = $cache[$ipath][(int)($this->scheme !== null)]; |
|
| 937 | 937 | } |
| 938 | 938 | else { |
| 939 | 939 | $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/'); |
@@ -232,7 +232,7 @@ |
||
| 232 | 232 | * |
| 233 | 233 | * @param array $request Request data (same form as {@see request_multiple}) |
| 234 | 234 | * @param boolean $merge_options Should we merge options as well? |
| 235 | - * @return array Request data |
|
| 235 | + * @return string Request data |
|
| 236 | 236 | */ |
| 237 | 237 | protected function merge_request($request, $merge_options = true) { |
| 238 | 238 | if ($this->url !== null) { |
@@ -29,7 +29,6 @@ |
||
| 29 | 29 | return $this->ancestor; |
| 30 | 30 | } |
| 31 | 31 | /** |
| 32 | - * @param Location $location |
|
| 33 | 32 | */ |
| 34 | 33 | public function setAncestor($ancestor) |
| 35 | 34 | { |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | public function setAncestor($ancestor) |
| 35 | 35 | { |
| 36 | - if(isset($ancestor) && $ancestor != "") |
|
| 36 | + if (isset($ancestor) && $ancestor != "") |
|
| 37 | 37 | { |
| 38 | 38 | $this->ancestor = $ancestor; |
| 39 | 39 | } |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | if ($result->num_rows > 0) |
| 18 | 18 | { |
| 19 | 19 | // output data of each row |
| 20 | - while($row = $result->fetch_assoc()) |
|
| 20 | + while ($row = $result->fetch_assoc()) |
|
| 21 | 21 | { |
| 22 | 22 | $accessToken = $row["access_token"]; |
| 23 | 23 | } |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | //createAccount(); |
| 32 | 32 | |
| 33 | 33 | //Set Location |
| 34 | - if(isset($_GET['city'])) { |
|
| 34 | + if (isset($_GET['city'])) { |
|
| 35 | 35 | |
| 36 | 36 | $url = 'https://maps.googleapis.com/maps/api/geocode/json?address=' . $_GET['city'] . '&key=AIzaSyCwhnja-or07012HqrhPW7prHEDuSvFT4w'; |
| 37 | 37 | $result = Requests::post($url); |
| 38 | - if(json_decode($result->body, true)['status'] == 'ZERO_RESULTS') |
|
| 38 | + if (json_decode($result->body, true)['status'] == 'ZERO_RESULTS') |
|
| 39 | 39 | { |
| 40 | 40 | $newPostionStatus = "0 results"; |
| 41 | 41 | } |
@@ -53,11 +53,11 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | //Vote |
| 56 | - if(isset($_GET['vote']) && isset($_GET['postID'])) { |
|
| 57 | - if($_GET['vote'] == "up") { |
|
| 56 | + if (isset($_GET['vote']) && isset($_GET['postID'])) { |
|
| 57 | + if ($_GET['vote'] == "up") { |
|
| 58 | 58 | $accountCreator = new Upvote(); |
| 59 | 59 | } |
| 60 | - else if($_GET['vote'] == "down") { |
|
| 60 | + else if ($_GET['vote'] == "down") { |
|
| 61 | 61 | $accountCreator = new Downvote(); |
| 62 | 62 | } |
| 63 | 63 | $accountCreator->setAccessToken($accessToken); |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | |
| 71 | 71 | //SendJodel |
| 72 | - if(isset($_POST['message'])) { |
|
| 72 | + if (isset($_POST['message'])) { |
|
| 73 | 73 | $ancestor; |
| 74 | - if(isset($_POST['ancestor'])) |
|
| 74 | + if (isset($_POST['ancestor'])) |
|
| 75 | 75 | { |
| 76 | 76 | $ancestor = $_POST['ancestor']; |
| 77 | 77 | } |
@@ -113,7 +113,7 @@ discard block |
||
| 113 | 113 | <a href="index.php"> |
| 114 | 114 | <h1> |
| 115 | 115 | Jodel WebClient |
| 116 | - <?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) echo '<i class="fa fa-refresh fa-1x"></i>';?> |
|
| 116 | + <?php if (!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) echo '<i class="fa fa-refresh fa-1x"></i>'; ?> |
|
| 117 | 117 | </h1> |
| 118 | 118 | </a> |
| 119 | 119 | <div class="clear"></div> |
@@ -128,14 +128,14 @@ discard block |
||
| 128 | 128 | $posts; |
| 129 | 129 | |
| 130 | 130 | //Get Post Details |
| 131 | - if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { |
|
| 131 | + if (isset($_GET['postID']) && isset($_GET['getPostDetails'])) { |
|
| 132 | 132 | //Header Nav in Comment View |
| 133 | 133 | ?> |
| 134 | - <a id="comment-back" href="index.php#postId-<?php echo $_GET['postID'];?>"> |
|
| 134 | + <a id="comment-back" href="index.php#postId-<?php echo $_GET['postID']; ?>"> |
|
| 135 | 135 | <i class="fa fa-angle-left fa-3x"></i> |
| 136 | 136 | </a> |
| 137 | 137 | |
| 138 | - <a id="comment-refresh" href="index.php?getPostDetails=<?php echo $_GET['getPostDetails'];?>&postID=<?php echo $_GET['postID'];?>"> |
|
| 138 | + <a id="comment-refresh" href="index.php?getPostDetails=<?php echo $_GET['getPostDetails']; ?>&postID=<?php echo $_GET['postID']; ?>"> |
|
| 139 | 139 | <i class="fa fa-refresh fa-2x"></i> |
| 140 | 140 | </a> |
| 141 | 141 | <?php |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | $data = $accountCreator->execute(); |
| 147 | 147 | |
| 148 | 148 | $posts[0] = $data; |
| 149 | - if(isset($data['children'])) { |
|
| 150 | - foreach($data['children'] as $child) { |
|
| 149 | + if (isset($data['children'])) { |
|
| 150 | + foreach ($data['children'] as $child) { |
|
| 151 | 151 | array_push($posts, $child); |
| 152 | 152 | } |
| 153 | 153 | $loops = $data['child_count'] + 1; |
@@ -157,14 +157,14 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | //Get Posts |
| 159 | 159 | else { |
| 160 | - if(isset($_GET['commentView'])) |
|
| 160 | + if (isset($_GET['commentView'])) |
|
| 161 | 161 | { |
| 162 | 162 | $commentView = true; |
| 163 | 163 | $url = "/v2/posts/location/discussed/"; |
| 164 | 164 | } |
| 165 | 165 | else |
| 166 | 166 | { |
| 167 | - if(isset($_GET['upVoteView'])) |
|
| 167 | + if (isset($_GET['upVoteView'])) |
|
| 168 | 168 | { |
| 169 | 169 | $upVoteView = true; |
| 170 | 170 | $url = "/v2/posts/location/popular/"; |
@@ -182,9 +182,9 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | |
| 185 | - for($i = 0; $i<$loops; $i++) { |
|
| 185 | + for ($i = 0; $i < $loops; $i++) { |
|
| 186 | 186 | |
| 187 | - if(isset($posts[$i])) { |
|
| 187 | + if (isset($posts[$i])) { |
|
| 188 | 188 | $lastPostId = $posts[$i]['post_id']; |
| 189 | 189 | |
| 190 | 190 | |
@@ -200,24 +200,24 @@ discard block |
||
| 200 | 200 | $timediff_inHours = (string)$timediff->format('%h'); |
| 201 | 201 | $timediff_inDays = (string)$timediff->format('%d'); |
| 202 | 202 | $timediff_inMonth = (string)$timediff->format('%m'); |
| 203 | - if($timediff_inMonth!=0) { |
|
| 203 | + if ($timediff_inMonth != 0) { |
|
| 204 | 204 | $timediff = $timediff_inMonth . "m"; |
| 205 | 205 | } |
| 206 | 206 | else |
| 207 | 207 | { |
| 208 | - if($timediff_inDays!=0) |
|
| 208 | + if ($timediff_inDays != 0) |
|
| 209 | 209 | { |
| 210 | 210 | $timediff = $timediff_inDays . "d"; |
| 211 | 211 | } |
| 212 | 212 | else |
| 213 | 213 | { |
| 214 | - if($timediff_inHours!=0) |
|
| 214 | + if ($timediff_inHours != 0) |
|
| 215 | 215 | { |
| 216 | 216 | $timediff = $timediff_inHours . "h"; |
| 217 | 217 | } |
| 218 | 218 | else |
| 219 | 219 | { |
| 220 | - if($timediff_inMinutes!=0) |
|
| 220 | + if ($timediff_inMinutes != 0) |
|
| 221 | 221 | { |
| 222 | 222 | $timediff = $timediff_inMinutes . "m"; |
| 223 | 223 | } |
@@ -230,10 +230,10 @@ discard block |
||
| 230 | 230 | } |
| 231 | 231 | ?> |
| 232 | 232 | |
| 233 | - <article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;"> |
|
| 233 | + <article id ="postId-<?php echo $posts[$i]["post_id"]; ?>" class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;"> |
|
| 234 | 234 | <content> |
| 235 | 235 | <?php |
| 236 | - if(isset($posts[$i]["image_url"])) { |
|
| 236 | + if (isset($posts[$i]["image_url"])) { |
|
| 237 | 237 | echo '<img src="' . $posts[$i]["image_url"] . '">'; |
| 238 | 238 | } |
| 239 | 239 | else { |
@@ -242,12 +242,12 @@ discard block |
||
| 242 | 242 | ?> |
| 243 | 243 | </content> |
| 244 | 244 | <aside> |
| 245 | - <a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>"> |
|
| 245 | + <a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>"> |
|
| 246 | 246 | <i class="fa fa-angle-up fa-3x"></i> |
| 247 | 247 | </a> |
| 248 | 248 | <br /> |
| 249 | - <?php echo $posts[$i]["vote_count"];?><br /> |
|
| 250 | - <a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>"> |
|
| 249 | + <?php echo $posts[$i]["vote_count"]; ?><br /> |
|
| 250 | + <a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>"> |
|
| 251 | 251 | <i class="fa fa-angle-down fa-3x"></i> |
| 252 | 252 | </a> |
| 253 | 253 | </aside> |
@@ -258,15 +258,15 @@ discard block |
||
| 258 | 258 | <td class="time"> |
| 259 | 259 | <span data-tooltip="Time"> |
| 260 | 260 | <i class="fa fa-clock-o"></i> |
| 261 | - <?php echo $timediff;?> |
|
| 261 | + <?php echo $timediff; ?> |
|
| 262 | 262 | </span> |
| 263 | 263 | </td> |
| 264 | 264 | <td class="comments"> |
| 265 | - <?php if($showCommentIcon) {?> |
|
| 265 | + <?php if ($showCommentIcon) {?> |
|
| 266 | 266 | <span data-tooltip="Comments"> |
| 267 | - <a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>"> |
|
| 267 | + <a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>"> |
|
| 268 | 268 | <i class="fa fa-commenting-o"></i> |
| 269 | - <?php if(array_key_exists("child_count", $posts[$i])) { |
|
| 269 | + <?php if (array_key_exists("child_count", $posts[$i])) { |
|
| 270 | 270 | echo $posts[$i]["child_count"]; |
| 271 | 271 | } else echo "0"; |
| 272 | 272 | ?> |
@@ -277,7 +277,7 @@ discard block |
||
| 277 | 277 | <td class="distance"> |
| 278 | 278 | <span data-tooltip="Distance"> |
| 279 | 279 | <i class="fa fa-map-marker"></i> |
| 280 | - <?php echo $posts[$i]["distance"];?> km |
|
| 280 | + <?php echo $posts[$i]["distance"]; ?> km |
|
| 281 | 281 | </span> |
| 282 | 282 | </td> |
| 283 | 283 | </tr> |
@@ -292,15 +292,15 @@ discard block |
||
| 292 | 292 | </content> |
| 293 | 293 | |
| 294 | 294 | </article> |
| 295 | - <?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?> |
|
| 295 | + <?php if (!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?> |
|
| 296 | 296 | <p id="loading"> |
| 297 | 297 | <img src="images/loading.gif" alt="Loading…" /> |
| 298 | 298 | </p> |
| 299 | 299 | <?php } ?> |
| 300 | 300 | <nav id="sortJodelBy"> |
| 301 | - <a href="index.php" <?php if(isset($timeView)) echo 'class="active"';?>><i class="fa fa-clock-o fa-3x"></i></a> |
|
| 302 | - <a href="index.php?commentView=true" <?php if(isset($commentView)) echo 'class="active"';?>><i class="fa fa-commenting-o fa-3x"></i></a> |
|
| 303 | - <a href="index.php?upVoteView=true" <?php if(isset($upVoteView)) echo 'class="active"';?>><i class="fa fa-angle-up fa-3x"></i></a> |
|
| 301 | + <a href="index.php" <?php if (isset($timeView)) echo 'class="active"'; ?>><i class="fa fa-clock-o fa-3x"></i></a> |
|
| 302 | + <a href="index.php?commentView=true" <?php if (isset($commentView)) echo 'class="active"'; ?>><i class="fa fa-commenting-o fa-3x"></i></a> |
|
| 303 | + <a href="index.php?upVoteView=true" <?php if (isset($upVoteView)) echo 'class="active"'; ?>><i class="fa fa-angle-up fa-3x"></i></a> |
|
| 304 | 304 | </nav> |
| 305 | 305 | </div> |
| 306 | 306 | |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | <article> |
| 309 | 309 | <h3>Position</h3> |
| 310 | 310 | <form method="get"> |
| 311 | - <input type="text" id="city" name="city" placeholder="<?php if(isset($newPositionStatus)) echo $newPositionStatus; else echo $posts[0]["location"]["name"]; ?>" required> |
|
| 311 | + <input type="text" id="city" name="city" placeholder="<?php if (isset($newPositionStatus)) echo $newPositionStatus; else echo $posts[0]["location"]["name"]; ?>" required> |
|
| 312 | 312 | |
| 313 | 313 | <input type="submit" value="Set Location" /> |
| 314 | 314 | </form> |
@@ -321,10 +321,10 @@ discard block |
||
| 321 | 321 | </article> |
| 322 | 322 | |
| 323 | 323 | <article> |
| 324 | - <?php if(isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?> |
|
| 324 | + <?php if (isset($_GET['postID']) && isset($_GET['getPostDetails'])) { ?> |
|
| 325 | 325 | <h2>Comment on Jodel</h2> |
| 326 | 326 | <form method="POST"> |
| 327 | - <input type="hidden" name="ancestor" value="<?php echo $_GET['postID'];?>" /> |
|
| 327 | + <input type="hidden" name="ancestor" value="<?php echo $_GET['postID']; ?>" /> |
|
| 328 | 328 | <textarea id="message" name="message" placeholder="Send a comment on a Jodel to all students within 10km" required></textarea> |
| 329 | 329 | <br /> |
| 330 | 330 | <input type="submit" value="SEND" /> |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | $(this).addClass('selected'); |
| 359 | 359 | }); |
| 360 | 360 | |
| 361 | - <?php if(!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?> |
|
| 361 | + <?php if (!isset($_GET['postID']) && !isset($_GET['getPostDetails'])) { ?> |
|
| 362 | 362 | $(document).ready(function() { |
| 363 | 363 | var win = $(window); |
| 364 | 364 | var lastPostId = "<?php echo $lastPostId; ?>"; |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | |
| 31 | 31 | if ($result->num_rows > 0) { |
| 32 | 32 | // output data of each row |
| 33 | - while($row = $result->fetch_assoc()) { |
|
| 33 | + while ($row = $result->fetch_assoc()) { |
|
| 34 | 34 | $access_token = $row["access_token"]; |
| 35 | 35 | } |
| 36 | 36 | } else { |
@@ -47,14 +47,14 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | $posts; |
| 49 | 49 | |
| 50 | - if(isset($_GET['commentView'])) |
|
| 50 | + if (isset($_GET['commentView'])) |
|
| 51 | 51 | { |
| 52 | 52 | $commentView = true; |
| 53 | 53 | $url = "/posts/location/discussed/"; |
| 54 | 54 | } |
| 55 | 55 | else |
| 56 | 56 | { |
| 57 | - if(isset($_GET['upVoteView'])) |
|
| 57 | + if (isset($_GET['upVoteView'])) |
|
| 58 | 58 | { |
| 59 | 59 | $upVoteView = true; |
| 60 | 60 | $url = "/posts/location/popular/"; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - if(isset($_GET['lastPostId'])) { |
|
| 69 | + if (isset($_GET['lastPostId'])) { |
|
| 70 | 70 | |
| 71 | 71 | $lastPostId = $_GET['lastPostId']; |
| 72 | 72 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | ?> |
| 77 | 77 | <div class="nextPosts"> |
| 78 | 78 | <?php |
| 79 | - for($i = 0; $i<$loops; $i++) { |
|
| 79 | + for ($i = 0; $i < $loops; $i++) { |
|
| 80 | 80 | |
| 81 | - if(isset($posts[$i])) { |
|
| 81 | + if (isset($posts[$i])) { |
|
| 82 | 82 | $lastPostId = $posts[$i]['post_id']; |
| 83 | 83 | |
| 84 | 84 | |
@@ -94,24 +94,24 @@ discard block |
||
| 94 | 94 | $timediff_inHours = (string)$timediff->format('%h'); |
| 95 | 95 | $timediff_inDays = (string)$timediff->format('%d'); |
| 96 | 96 | $timediff_inMonth = (string)$timediff->format('%m'); |
| 97 | - if($timediff_inMonth!=0) { |
|
| 97 | + if ($timediff_inMonth != 0) { |
|
| 98 | 98 | $timediff = $timediff_inMonth . "m"; |
| 99 | 99 | } |
| 100 | 100 | else |
| 101 | 101 | { |
| 102 | - if($timediff_inDays!=0) |
|
| 102 | + if ($timediff_inDays != 0) |
|
| 103 | 103 | { |
| 104 | 104 | $timediff = $timediff_inDays . "d"; |
| 105 | 105 | } |
| 106 | 106 | else |
| 107 | 107 | { |
| 108 | - if($timediff_inHours!=0) |
|
| 108 | + if ($timediff_inHours != 0) |
|
| 109 | 109 | { |
| 110 | 110 | $timediff = $timediff_inHours . "h"; |
| 111 | 111 | } |
| 112 | 112 | else |
| 113 | 113 | { |
| 114 | - if($timediff_inMinutes!=0) |
|
| 114 | + if ($timediff_inMinutes != 0) |
|
| 115 | 115 | { |
| 116 | 116 | $timediff = $timediff_inMinutes . "m"; |
| 117 | 117 | } |
@@ -124,10 +124,10 @@ discard block |
||
| 124 | 124 | } |
| 125 | 125 | ?> |
| 126 | 126 | |
| 127 | - <article class="jodel" style="background-color: #<?php echo $posts[$i]["color"];?>;"> |
|
| 127 | + <article class="jodel" style="background-color: #<?php echo $posts[$i]["color"]; ?>;"> |
|
| 128 | 128 | <content> |
| 129 | 129 | <?php |
| 130 | - if(isset($posts[$i]["image_url"])) { |
|
| 130 | + if (isset($posts[$i]["image_url"])) { |
|
| 131 | 131 | echo '<img src="' . $posts[$i]["image_url"] . '">'; |
| 132 | 132 | } |
| 133 | 133 | else { |
@@ -136,12 +136,12 @@ discard block |
||
| 136 | 136 | ?> |
| 137 | 137 | </content> |
| 138 | 138 | <aside> |
| 139 | - <a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"];?>"> |
|
| 139 | + <a href="index.php?vote=up&postID=<?php echo $posts[$i]["post_id"]; ?>"> |
|
| 140 | 140 | <i class="fa fa-angle-up fa-3x"></i> |
| 141 | 141 | </a> |
| 142 | 142 | <br /> |
| 143 | - <?php echo $posts[$i]["vote_count"];?><br /> |
|
| 144 | - <a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"];?>"> |
|
| 143 | + <?php echo $posts[$i]["vote_count"]; ?><br /> |
|
| 144 | + <a href="index.php?vote=down&postID=<?php echo $posts[$i]["post_id"]; ?>"> |
|
| 145 | 145 | <i class="fa fa-angle-down fa-3x"></i> |
| 146 | 146 | </a> |
| 147 | 147 | </aside> |
@@ -152,15 +152,15 @@ discard block |
||
| 152 | 152 | <td class="time"> |
| 153 | 153 | <span data-tooltip="Time"> |
| 154 | 154 | <i class="fa fa-clock-o"></i> |
| 155 | - <?php echo $timediff;?> |
|
| 155 | + <?php echo $timediff; ?> |
|
| 156 | 156 | </span> |
| 157 | 157 | </td> |
| 158 | 158 | <td class="comments"> |
| 159 | - <?php if($showCommentIcon) {?> |
|
| 159 | + <?php if ($showCommentIcon) {?> |
|
| 160 | 160 | <span data-tooltip="Comments"> |
| 161 | - <a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"];?>"> |
|
| 161 | + <a href="index.php?getPostDetails=true&postID=<?php echo $posts[$i]["post_id"]; ?>"> |
|
| 162 | 162 | <i class="fa fa-commenting-o"></i> |
| 163 | - <?php if(array_key_exists("child_count", $posts[$i])) { |
|
| 163 | + <?php if (array_key_exists("child_count", $posts[$i])) { |
|
| 164 | 164 | echo $posts[$i]["child_count"]; |
| 165 | 165 | } else echo "0"; |
| 166 | 166 | ?> |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | <td class="distance"> |
| 172 | 172 | <span data-tooltip="Distance"> |
| 173 | 173 | <i class="fa fa-map-marker"></i> |
| 174 | - <?php echo $posts[$i]["distance"];?> km |
|
| 174 | + <?php echo $posts[$i]["distance"]; ?> km |
|
| 175 | 175 | </span> |
| 176 | 176 | </td> |
| 177 | 177 | </tr> |
@@ -38,7 +38,7 @@ |
||
| 38 | 38 | `X-Api-Version` varchar(10) NOT NULL default '0.2', |
| 39 | 39 | PRIMARY KEY (`id`) |
| 40 | 40 | ) DEFAULT CHARSET=utf8"; |
| 41 | - if(!$db->query($query)) |
|
| 41 | + if (!$db->query($query)) |
|
| 42 | 42 | { |
| 43 | 43 | throw new Exception($db->error($mysqli)); |
| 44 | 44 | } |