X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=100c9480882de740f4e06c6f3dfd5a106a4c4a29;hb=3972fe62fe8afb3791e9d6526e7665501a577b81;hp=2f92b2f03cde260121aab3f85bfa71434948d588;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 2f92b2f03c..100c948088 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -1,15 +1,31 @@ . + * * Module for uploading a picture to the profile wall * * By default the picture will be stored in the photo album with the name Wall Photos. * You can specify a different album by adding an optional query string "album=" * to the url + * */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Session; use Friendica\Database\DBA; @@ -25,19 +41,13 @@ function wall_upload_post(App $a, $desktopmode = true) Logger::log("wall upload: starting new upload", Logger::DEBUG); $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json'); - $album = (!empty($_GET['album']) ? Strings::escapeTags(trim($_GET['album'])) : ''); + $album = trim($_GET['album'] ?? ''); - if ($a->argc > 1) { + if (DI::args()->getArgc() > 1) { if (empty($_FILES['media'])) { - $nick = $a->argv[1]; - $r = q("SELECT `user`.*, `contact`.`id` FROM `user` - INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` - WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 - AND `contact`.`self` = 1 LIMIT 1", - DBA::escape($nick) - ); - - if (!DBA::isResult($r)) { + $nick = DI::args()->getArgv()[1]; + $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $nick, 'blocked' => false]); + if (!DBA::isResult($user)) { if ($r_json) { echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); @@ -46,12 +56,7 @@ function wall_upload_post(App $a, $desktopmode = true) } } else { $user_info = api_get_user($a); - $r = q("SELECT `user`.*, `contact`.`id` FROM `user` - INNER JOIN `contact` on `user`.`uid` = `contact`.`uid` - WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 - AND `contact`.`self` = 1 LIMIT 1", - DBA::escape($user_info['screen_name']) - ); + $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $user_info['screen_name'], 'blocked' => false]); } } else { if ($r_json) { @@ -67,26 +72,17 @@ function wall_upload_post(App $a, $desktopmode = true) $can_post = false; $visitor = 0; - $page_owner_uid = $r[0]['uid']; - $default_cid = $r[0]['id']; - $page_owner_nick = $r[0]['nickname']; - $community_page = (($r[0]['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false); + $page_owner_uid = $user['uid']; + $default_cid = $user['id']; + $page_owner_nick = $user['nickname']; + $community_page = (($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false); if ((local_user()) && (local_user() == $page_owner_uid)) { $can_post = true; } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) { $contact_id = Session::getRemoteContactID($page_owner_uid); - - $r = q("SELECT `uid` FROM `contact` - WHERE `blocked` = 0 AND `pending` = 0 - AND `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval($page_owner_uid) - ); - if (DBA::isResult($r)) { - $can_post = true; - $visitor = $contact_id; - } + $can_post = DBA::exists('contact', ['blocked' => false, 'pending' => false, 'id' => $contact_id, 'uid' => $page_owner_uid]); + $visitor = $contact_id; } if (!$can_post) { @@ -94,7 +90,7 @@ function wall_upload_post(App $a, $desktopmode = true) echo json_encode(['error' => DI::l10n()->t('Permission denied.')]); exit(); } - notice(DI::l10n()->t('Permission denied.') . EOL); + notice(DI::l10n()->t('Permission denied.')); exit(); } @@ -154,44 +150,15 @@ function wall_upload_post(App $a, $desktopmode = true) echo json_encode(['error' => DI::l10n()->t('Invalid request.')]); exit(); } - notice(DI::l10n()->t('Invalid request.').EOL); + notice(DI::l10n()->t('Invalid request.')); exit(); } - // This is a special treatment for picture upload from Twidere - if (($filename == "octet-stream") && ($filetype != "")) { - $filename = $filetype; - $filetype = ""; - } - - if ($filetype == "") { - $filetype = Images::guessType($filename); - } - - // If there is a temp name, then do a manual check - // This is more reliable than the provided value - - $imagedata = getimagesize($src); - if ($imagedata) { - $filetype = $imagedata['mime']; - } + $filetype = Images::getMimeTypeBySource($src, $filename, $filetype); Logger::log("File upload src: " . $src . " - filename: " . $filename . " - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG); - $maximagesize = Config::get('system', 'maximagesize'); - - if (($maximagesize) && ($filesize > $maximagesize)) { - $msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)); - if ($r_json) { - echo json_encode(['error' => $msg]); - } else { - echo $msg. EOL; - } - @unlink($src); - exit(); - } - $imagedata = @file_get_contents($src); $Image = new Image($imagedata, $filetype); @@ -209,18 +176,45 @@ function wall_upload_post(App $a, $desktopmode = true) $Image->orient($src); @unlink($src); - $max_length = Config::get('system', 'max_image_length'); + $max_length = DI::config()->get('system', 'max_image_length'); if (!$max_length) { $max_length = MAX_IMAGE_LENGTH; } if ($max_length > 0) { $Image->scaleDown($max_length); + $filesize = strlen($Image->asString()); Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG); } $width = $Image->getWidth(); $height = $Image->getHeight(); + $maximagesize = DI::config()->get('system', 'maximagesize'); + + if (!empty($maximagesize) && ($filesize > $maximagesize)) { + // Scale down to multiples of 640 until the maximum size isn't exceeded anymore + foreach ([5120, 2560, 1280, 640] as $pixels) { + if (($filesize > $maximagesize) && (max($width, $height) > $pixels)) { + Logger::info('Resize', ['size' => $filesize, 'width' => $width, 'height' => $height, 'max' => $maximagesize, 'pixels' => $pixels]); + $Image->scaleDown($pixels); + $filesize = strlen($Image->asString()); + $width = $Image->getWidth(); + $height = $Image->getHeight(); + } + } + if ($filesize > $maximagesize) { + Logger::notice('Image size is too big', ['size' => $filesize, 'max' => $maximagesize]); + $msg = DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)); + if ($r_json) { + echo json_encode(['error' => $msg]); + } else { + echo $msg. EOL; + } + @unlink($src); + exit(); + } + } + $resource_id = Photo::newResource(); $smallest = 0; @@ -261,12 +255,8 @@ function wall_upload_post(App $a, $desktopmode = true) } if (!$desktopmode) { - $r = q("SELECT `id`, `datasize`, `width`, `height`, `type` FROM `photo` - WHERE `resource-id` = '%s' - ORDER BY `width` DESC LIMIT 1", - $resource_id - ); - if (!$r) { + $photo = Photo::selectFirst(['id', 'datasize', 'width', 'height', 'type'], ['resource-id' => $resource_id], ['order' => ['width']]); + if (!$photo) { if ($r_json) { echo json_encode(['error' => '']); exit(); @@ -275,11 +265,11 @@ function wall_upload_post(App $a, $desktopmode = true) } $picture = []; - $picture["id"] = $r[0]["id"]; - $picture["size"] = $r[0]["datasize"]; - $picture["width"] = $r[0]["width"]; - $picture["height"] = $r[0]["height"]; - $picture["type"] = $r[0]["type"]; + $picture["id"] = $photo["id"]; + $picture["size"] = $photo["datasize"]; + $picture["width"] = $photo["width"]; + $picture["height"] = $photo["height"]; + $picture["type"] = $photo["type"]; $picture["albumpage"] = DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id; $picture["picture"] = DI::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt(); $picture["preview"] = DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt();