@@ -3,37 +3,37 @@ |
||
| 3 | 3 | |
| 4 | 4 | class UpdateLocation extends AbstractRequest { |
| 5 | 5 | /** |
| 6 | - * @var Location |
|
| 7 | - */ |
|
| 8 | - public $location; |
|
| 9 | - /** |
|
| 10 | - * @return Location |
|
| 11 | - */ |
|
| 12 | - public function getLocation() |
|
| 13 | - { |
|
| 14 | - return $this->location; |
|
| 15 | - } |
|
| 16 | - /** |
|
| 17 | - * @param Location $location |
|
| 18 | - */ |
|
| 19 | - public function setLocation($location) |
|
| 20 | - { |
|
| 21 | - $this->location = $location; |
|
| 22 | - } |
|
| 6 | + * @var Location |
|
| 7 | + */ |
|
| 8 | + public $location; |
|
| 9 | + /** |
|
| 10 | + * @return Location |
|
| 11 | + */ |
|
| 12 | + public function getLocation() |
|
| 13 | + { |
|
| 14 | + return $this->location; |
|
| 15 | + } |
|
| 16 | + /** |
|
| 17 | + * @param Location $location |
|
| 18 | + */ |
|
| 19 | + public function setLocation($location) |
|
| 20 | + { |
|
| 21 | + $this->location = $location; |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - function getApiEndPoint() |
|
| 25 | - { |
|
| 26 | - return '/v2/users/location'; |
|
| 27 | - } |
|
| 28 | - function getPayload() |
|
| 29 | - { |
|
| 30 | - return array( |
|
| 24 | + function getApiEndPoint() |
|
| 25 | + { |
|
| 26 | + return '/v2/users/location'; |
|
| 27 | + } |
|
| 28 | + function getPayload() |
|
| 29 | + { |
|
| 30 | + return array( |
|
| 31 | 31 | 'location' => $this->getLocation()->toArray(), |
| 32 | - ); |
|
| 33 | - } |
|
| 34 | - function getMethod() |
|
| 35 | - { |
|
| 36 | - return 'PUT'; |
|
| 37 | - } |
|
| 32 | + ); |
|
| 33 | + } |
|
| 34 | + function getMethod() |
|
| 35 | + { |
|
| 36 | + return 'PUT'; |
|
| 37 | + } |
|
| 38 | 38 | } |
| 39 | 39 | |
@@ -1,18 +1,18 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | class GetCaptcha extends AbstractRequest |
| 3 | 3 | { |
| 4 | - function getApiEndPoint() |
|
| 5 | - { |
|
| 6 | - return '/v3/user/verification/imageCaptcha/'; |
|
| 7 | - } |
|
| 8 | - function getPayload() |
|
| 9 | - { |
|
| 10 | - return array( |
|
| 11 | - ); |
|
| 12 | - } |
|
| 13 | - function getMethod() |
|
| 14 | - { |
|
| 15 | - return 'GET'; |
|
| 16 | - } |
|
| 4 | + function getApiEndPoint() |
|
| 5 | + { |
|
| 6 | + return '/v3/user/verification/imageCaptcha/'; |
|
| 7 | + } |
|
| 8 | + function getPayload() |
|
| 9 | + { |
|
| 10 | + return array( |
|
| 11 | + ); |
|
| 12 | + } |
|
| 13 | + function getMethod() |
|
| 14 | + { |
|
| 15 | + return 'GET'; |
|
| 16 | + } |
|
| 17 | 17 | } |
| 18 | 18 | |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | |
| 3 | 3 | class Jodel |
| 4 | 4 | { |
| 5 | - public $jodel; |
|
| 5 | + public $jodel; |
|
| 6 | 6 | |
| 7 | 7 | |
| 8 | 8 | } |
| 9 | 9 | \ No newline at end of file |
@@ -3,18 +3,18 @@ |
||
| 3 | 3 | |
| 4 | 4 | class GetPostDetails extends AbstractRequest { |
| 5 | 5 | |
| 6 | - function getApiEndPoint() |
|
| 7 | - { |
|
| 8 | - return '/v2/posts/' . $_GET['postId']; |
|
| 9 | - } |
|
| 10 | - function getPayload() |
|
| 11 | - { |
|
| 12 | - return array( |
|
| 13 | - ); |
|
| 14 | - } |
|
| 15 | - function getMethod() |
|
| 16 | - { |
|
| 17 | - return 'GET'; |
|
| 18 | - } |
|
| 6 | + function getApiEndPoint() |
|
| 7 | + { |
|
| 8 | + return '/v2/posts/' . $_GET['postId']; |
|
| 9 | + } |
|
| 10 | + function getPayload() |
|
| 11 | + { |
|
| 12 | + return array( |
|
| 13 | + ); |
|
| 14 | + } |
|
| 15 | + function getMethod() |
|
| 16 | + { |
|
| 17 | + return 'GET'; |
|
| 18 | + } |
|
| 19 | 19 | } |
| 20 | 20 | |
@@ -2,41 +2,41 @@ |
||
| 2 | 2 | |
| 3 | 3 | class GetChannel extends AbstractRequest |
| 4 | 4 | { |
| 5 | - /** |
|
| 6 | - * @var Location |
|
| 7 | - */ |
|
| 8 | - public $location; |
|
| 9 | - public $channel; |
|
| 10 | - public $hasPayload = FALSE; |
|
| 11 | - public $lastPostId = ''; |
|
| 12 | - public $view = 'combo'; |
|
| 5 | + /** |
|
| 6 | + * @var Location |
|
| 7 | + */ |
|
| 8 | + public $location; |
|
| 9 | + public $channel; |
|
| 10 | + public $hasPayload = FALSE; |
|
| 11 | + public $lastPostId = ''; |
|
| 12 | + public $view = 'combo'; |
|
| 13 | 13 | |
| 14 | - function getApiEndPoint() |
|
| 15 | - { |
|
| 16 | - if($this->lastPostId == '') |
|
| 17 | - { |
|
| 18 | - $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel; |
|
| 19 | - } |
|
| 20 | - else |
|
| 21 | - { |
|
| 22 | - if($this->view == 'combo') |
|
| 23 | - { |
|
| 24 | - $apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId; |
|
| 25 | - } |
|
| 26 | - else |
|
| 27 | - { |
|
| 28 | - $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId; |
|
| 29 | - } |
|
| 30 | - } |
|
| 31 | - return $apiEndPoint; |
|
| 32 | - } |
|
| 33 | - function getPayload() |
|
| 34 | - { |
|
| 35 | - return array( |
|
| 36 | - ); |
|
| 37 | - } |
|
| 38 | - function getMethod() |
|
| 39 | - { |
|
| 40 | - return 'GET'; |
|
| 41 | - } |
|
| 14 | + function getApiEndPoint() |
|
| 15 | + { |
|
| 16 | + if($this->lastPostId == '') |
|
| 17 | + { |
|
| 18 | + $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel; |
|
| 19 | + } |
|
| 20 | + else |
|
| 21 | + { |
|
| 22 | + if($this->view == 'combo') |
|
| 23 | + { |
|
| 24 | + $apiEndPoint = '/v3/posts/hashtag?hashtag=' . $this->channel . '&after=' . $this->lastPostId; |
|
| 25 | + } |
|
| 26 | + else |
|
| 27 | + { |
|
| 28 | + $apiEndPoint = '/v3/posts/hashtag/' . $this->view . '?hashtag=' . $this->channel . '&after=' . $this->lastPostId; |
|
| 29 | + } |
|
| 30 | + } |
|
| 31 | + return $apiEndPoint; |
|
| 32 | + } |
|
| 33 | + function getPayload() |
|
| 34 | + { |
|
| 35 | + return array( |
|
| 36 | + ); |
|
| 37 | + } |
|
| 38 | + function getMethod() |
|
| 39 | + { |
|
| 40 | + return 'GET'; |
|
| 41 | + } |
|
| 42 | 42 | } |
@@ -129,7 +129,7 @@ |
||
| 129 | 129 | <?php |
| 130 | 130 | if(is_file(realpath(__DIR__ . '/..') . '/piwik-script.html')) |
| 131 | 131 | { |
| 132 | - include(realpath(__DIR__ . '/..') . '/piwik-script.html'); |
|
| 132 | + include(realpath(__DIR__ . '/..') . '/piwik-script.html'); |
|
| 133 | 133 | } |
| 134 | 134 | ?> |
| 135 | 135 | |
@@ -13,17 +13,17 @@ |
||
| 13 | 13 | public $varsToDump; |
| 14 | 14 | |
| 15 | 15 | function __construct($msg = 'not Set', $varsToDump = 'not Set', $view = 'not Set', $actions = 'not Set', $accountId = 'not Set', $isVerified = 'not Set', $isTokenFresh = 'not Set', $page = 'not Set', $referrer = 'not Set') |
| 16 | - { |
|
| 17 | - $this->view = $view; |
|
| 18 | - $this->actions = $actions; |
|
| 19 | - $this->accountId = $accountId; |
|
| 20 | - $this->isVerified = $isVerified; |
|
| 21 | - $this->isTokenFresh = $isTokenFresh; |
|
| 22 | - $this->page = $page; |
|
| 23 | - $this->referrer = $referrer; |
|
| 24 | - $this->msg = $msg; |
|
| 25 | - $this->varsToDump = $varsToDump; |
|
| 26 | - } |
|
| 16 | + { |
|
| 17 | + $this->view = $view; |
|
| 18 | + $this->actions = $actions; |
|
| 19 | + $this->accountId = $accountId; |
|
| 20 | + $this->isVerified = $isVerified; |
|
| 21 | + $this->isTokenFresh = $isTokenFresh; |
|
| 22 | + $this->page = $page; |
|
| 23 | + $this->referrer = $referrer; |
|
| 24 | + $this->msg = $msg; |
|
| 25 | + $this->varsToDump = $varsToDump; |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | 28 | function writeErrorToLog() |
| 29 | 29 | { |
@@ -1,41 +1,41 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | class SendJodel extends AbstractRequest { |
| 4 | - public $location; |
|
| 5 | - public $ancestor = ""; |
|
| 6 | - public $color = ""; |
|
| 7 | - public $image = ''; |
|
| 4 | + public $location; |
|
| 5 | + public $ancestor = ""; |
|
| 6 | + public $color = ""; |
|
| 7 | + public $image = ''; |
|
| 8 | 8 | |
| 9 | - function getApiEndPoint() |
|
| 10 | - { |
|
| 11 | - return '/v3/posts/'; |
|
| 12 | - } |
|
| 9 | + function getApiEndPoint() |
|
| 10 | + { |
|
| 11 | + return '/v3/posts/'; |
|
| 12 | + } |
|
| 13 | 13 | |
| 14 | - function getPayload() |
|
| 15 | - { |
|
| 16 | - if($this->image != '') |
|
| 17 | - { |
|
| 18 | - return array( |
|
| 19 | - "ancestor" => $this->ancestor, |
|
| 20 | - "color" => $this->color, |
|
| 21 | - "location" => $this->location->toArray(), |
|
| 22 | - "message" => $_POST['message'], |
|
| 23 | - 'image' => base64_encode($this->image), |
|
| 24 | - ); |
|
| 25 | - } |
|
| 26 | - else |
|
| 27 | - { |
|
| 28 | - return array( |
|
| 29 | - "ancestor" => $this->ancestor, |
|
| 30 | - "color" => $this->color, |
|
| 31 | - "location" => $this->location->toArray(), |
|
| 32 | - "message" => $_POST['message'], |
|
| 33 | - ); |
|
| 34 | - } |
|
| 14 | + function getPayload() |
|
| 15 | + { |
|
| 16 | + if($this->image != '') |
|
| 17 | + { |
|
| 18 | + return array( |
|
| 19 | + "ancestor" => $this->ancestor, |
|
| 20 | + "color" => $this->color, |
|
| 21 | + "location" => $this->location->toArray(), |
|
| 22 | + "message" => $_POST['message'], |
|
| 23 | + 'image' => base64_encode($this->image), |
|
| 24 | + ); |
|
| 25 | + } |
|
| 26 | + else |
|
| 27 | + { |
|
| 28 | + return array( |
|
| 29 | + "ancestor" => $this->ancestor, |
|
| 30 | + "color" => $this->color, |
|
| 31 | + "location" => $this->location->toArray(), |
|
| 32 | + "message" => $_POST['message'], |
|
| 33 | + ); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - } |
|
| 37 | - function getMethod() |
|
| 38 | - { |
|
| 39 | - return 'POST'; |
|
| 40 | - } |
|
| 36 | + } |
|
| 37 | + function getMethod() |
|
| 38 | + { |
|
| 39 | + return 'POST'; |
|
| 40 | + } |
|
| 41 | 41 | } |
@@ -48,27 +48,27 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | function user_log($msg) |
| 50 | 50 | { |
| 51 | - $log = $msg . PHP_EOL; |
|
| 52 | - file_put_contents(realpath(__DIR__ . '/..') . '/logs/user_log-' . date("j.n.Y") . '.txt', $log, FILE_APPEND); |
|
| 51 | + $log = $msg . PHP_EOL; |
|
| 52 | + file_put_contents(realpath(__DIR__ . '/..') . '/logs/user_log-' . date("j.n.Y") . '.txt', $log, FILE_APPEND); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | function isUserBot() |
| 56 | 56 | { |
| 57 | - preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches); |
|
| 57 | + preg_match('/bot|spider|google|twitter/i', $_SERVER['HTTP_USER_AGENT'], $matches); |
|
| 58 | 58 | |
| 59 | - return (isset($matches[0])) ? true : false; |
|
| 59 | + return (isset($matches[0])) ? true : false; |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | function configPropertyExists($config, $property) |
| 63 | 63 | { |
| 64 | - if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx') |
|
| 65 | - { |
|
| 66 | - return FALSE; |
|
| 67 | - } |
|
| 68 | - else |
|
| 69 | - { |
|
| 70 | - return TRUE; |
|
| 71 | - } |
|
| 64 | + if(!array_key_exists($property, $config) || !isset($config[$property]) || $config[$property] == '' || $config[$property] == 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx') |
|
| 65 | + { |
|
| 66 | + return FALSE; |
|
| 67 | + } |
|
| 68 | + else |
|
| 69 | + { |
|
| 70 | + return TRUE; |
|
| 71 | + } |
|
| 72 | 72 | } |
| 73 | 73 | function isUserAdmin() { |
| 74 | 74 | global $config; |
@@ -84,17 +84,17 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | function isDeviceUidInDatabase($deviceUid) |
| 86 | 86 | { |
| 87 | - $db = new DatabaseConnect(); |
|
| 88 | - $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'"); |
|
| 89 | - |
|
| 90 | - if ($result->num_rows > 0) |
|
| 91 | - { |
|
| 92 | - return TRUE; |
|
| 93 | - } |
|
| 94 | - else |
|
| 95 | - { |
|
| 96 | - return FALSE; |
|
| 97 | - } |
|
| 87 | + $db = new DatabaseConnect(); |
|
| 88 | + $result = $db->query("SELECT * FROM accounts WHERE device_uid='" . $deviceUid . "'"); |
|
| 89 | + |
|
| 90 | + if ($result->num_rows > 0) |
|
| 91 | + { |
|
| 92 | + return TRUE; |
|
| 93 | + } |
|
| 94 | + else |
|
| 95 | + { |
|
| 96 | + return FALSE; |
|
| 97 | + } |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | //Check if it's a Spider or Google Bot |
@@ -121,14 +121,14 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | if(configPropertyExists($config, 'karmaDeviceUid')) |
| 124 | - { |
|
| 125 | - $jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']); |
|
| 126 | - } |
|
| 127 | - else |
|
| 128 | - { |
|
| 129 | - error_log("No Karma deviceUid set in config file"); |
|
| 124 | + { |
|
| 125 | + $jodelAccountForKarma = new JodelAccount($config['karmaDeviceUid']); |
|
| 126 | + } |
|
| 127 | + else |
|
| 128 | + { |
|
| 129 | + error_log("No Karma deviceUid set in config file"); |
|
| 130 | 130 | $jodelAccountForKarma = new JodelAccount($deviceUid); |
| 131 | - } |
|
| 131 | + } |
|
| 132 | 132 | |
| 133 | 133 | /* |
| 134 | 134 | * Cunstruct View |