diff --git a/include/api.php b/include/api.php index 0b925aee0f..8e89895ded 100644 --- a/include/api.php +++ b/include/api.php @@ -1186,12 +1186,12 @@ function api_statuses_update($type) INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = ?) AND `photo`.`uid` = ? ORDER BY `photo`.`width` DESC LIMIT 2", $id, api_user())); - + if (!empty($media)) { $ressources[] = $media[0]['resource-id']; $phototypes = Images::supportedTypes(); $ext = $phototypes[$media[0]['type']]; - + $attachment = ['type' => Post\Media::IMAGE, 'mimetype' => $media[0]['type'], 'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext, 'size' => $media[0]['datasize'], @@ -1199,7 +1199,7 @@ function api_statuses_update($type) 'description' => $media[0]['desc'] ?? '', 'width' => $media[0]['width'], 'height' => $media[0]['height']]; - + if (count($media) > 1) { $attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext; $attachment['preview-width'] = $media[1]['width']; diff --git a/mod/settings.php b/mod/settings.php index 3a3f0b65dc..ec81339848 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -326,7 +326,7 @@ function settings_post(App $a) $detailed_notif = (($_POST['detailed_notif'] == 1) ? 1 : 0); $notify_ignored = (($_POST['notify_ignored'] == 1) ? 1 : 0); - + $notify = 0; if (!empty($_POST['notify1'])) { diff --git a/mod/unfollow.php b/mod/unfollow.php index 1c6022a4cb..aca17727b6 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -158,4 +158,4 @@ function unfollow_process(string $url) } DI::baseUrl()->redirect($return_path); -} \ No newline at end of file +} diff --git a/mod/update_notes.php b/mod/update_notes.php index 3b85d34b9a..641f7db8be 100644 --- a/mod/update_notes.php +++ b/mod/update_notes.php @@ -43,4 +43,4 @@ function update_notes_content(App $a) { $text = notes_content($a, $profile_uid); System::htmlUpdateExit($text); -} \ No newline at end of file +} diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php index f315b3b537..4263d8cf4a 100644 --- a/src/Content/Widget/TagCloud.php +++ b/src/Content/Widget/TagCloud.php @@ -127,8 +127,8 @@ class TagCloud private static function tagCalc(array $arr) { $tags = []; - $min = 1e9; - $max = -1e9; + $min = 1000000000.0; + $max = -1000000000.0; $x = 0; if (!$arr) { @@ -145,7 +145,7 @@ class TagCloud } usort($tags, 'self::tagsSort'); - $range = max(.01, $max - $min) * 1.0001; + $range = max(0.01, $max - $min) * 1.0001; for ($x = 0; $x < count($tags); $x ++) { $tags[$x][2] = 1 + floor(9 * ($tags[$x][1] - $min) / $range); diff --git a/src/Module/Attach.php b/src/Module/Attach.php index 7a288fb3b9..2acbf31b42 100644 --- a/src/Module/Attach.php +++ b/src/Module/Attach.php @@ -43,7 +43,7 @@ class Attach extends BaseModule // @TODO: Replace with parameter from router $item_id = intval($a->argv[1]); - + // Check for existence $item = MAttach::exists(['id' => $item_id]); if ($item === false) { diff --git a/src/Network/HTTPRequest.php b/src/Network/HTTPRequest.php index 74cf9cd055..bd31ac1e14 100644 --- a/src/Network/HTTPRequest.php +++ b/src/Network/HTTPRequest.php @@ -70,7 +70,7 @@ class HTTPRequest implements IHTTPRequest * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function get(string $url, array $opts = [], int &$redirects = 0) + public function get(string $url, array $opts = [], &$redirects = 0) { $stamp1 = microtime(true); @@ -222,7 +222,7 @@ class HTTPRequest implements IHTTPRequest * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function post(string $url, $params, array $headers = [], int $timeout = 0, int &$redirects = 0) + public function post(string $url, $params, array $headers = [], int $timeout = 0, &$redirects = 0) { $stamp1 = microtime(true); @@ -447,7 +447,7 @@ class HTTPRequest implements IHTTPRequest * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0) + public function fetch(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0) { $ret = $this->fetchFull($url, $timeout, $accept_content, $cookiejar, $redirects); @@ -461,7 +461,7 @@ class HTTPRequest implements IHTTPRequest * * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0) + public function fetchFull(string $url, int $timeout = 0, string $accept_content = '', string $cookiejar = '', &$redirects = 0) { return $this->get( $url, diff --git a/src/Object/Api/Mastodon/Status.php b/src/Object/Api/Mastodon/Status.php index 227395d171..eb88ce5f1a 100644 --- a/src/Object/Api/Mastodon/Status.php +++ b/src/Object/Api/Mastodon/Status.php @@ -114,7 +114,8 @@ class Status extends BaseDataTransferObject $this->visibility = $visibility[$item['private']]; $languages = json_decode($item['language'], true); - $this->language = is_array($languages) ? array_key_first($languages) : null; + reset($languages); + $this->language = is_array($languages) ? key($languages) : null; $this->uri = $item['uri']; $this->url = $item['plink'] ?? null;