X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=a9828e61f94333b478b4984ffe694c184fc2d62b;hb=720a43461d67ab229de0aecfc5008f22cc4c1c54;hp=c3ba323043aa5a55ca8b0cb1f0029e477b9c19da;hpb=fc2340d4afe6466c58e35afd64fe9010bf185b04;p=friendica.git diff --git a/mod/wall_upload.php b/mod/wall_upload.php index c3ba323043..a9828e61f9 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -1,6 +1,6 @@ argc > 1) { + if (DI::args()->getArgc() > 1) { if (empty($_FILES['media'])) { - $nick = $a->argv[1]; + $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) { @@ -55,8 +56,7 @@ function wall_upload_post(App $a, $desktopmode = true) return; } } else { - $user_info = api_get_user($a); - $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['nickname' => $user_info['screen_name'], 'blocked' => false]); + $user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['uid' => BaseApi::getCurrentUserID(), 'blocked' => false]); } } else { if ($r_json) { @@ -81,17 +81,8 @@ function wall_upload_post(App $a, $desktopmode = true) $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) { @@ -165,21 +156,8 @@ function wall_upload_post(App $a, $desktopmode = true) $filetype = Images::getMimeTypeBySource($src, $filename, $filetype); - Logger::log("File upload src: " . $src . " - filename: " . $filename . - " - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG); - - $maximagesize = DI::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(); - } + Logger::info("File upload src: " . $src . " - filename: " . $filename . + " - size: " . $filesize . " - type: " . $filetype); $imagedata = @file_get_contents($src); $Image = new Image($imagedata, $filetype); @@ -199,17 +177,41 @@ function wall_upload_post(App $a, $desktopmode = true) @unlink($src); $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); - Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG); + $filesize = strlen($Image->asString()); + Logger::info("File upload: Scaling picture to new size " . $max_length); } $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; @@ -221,7 +223,7 @@ function wall_upload_post(App $a, $desktopmode = true) $defperm = '<' . $default_cid . '>'; - $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, 0, $defperm); + $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 0, Photo::DEFAULT, $defperm); if (!$r) { $msg = DI::l10n()->t('Image upload failed.'); @@ -235,7 +237,7 @@ function wall_upload_post(App $a, $desktopmode = true) if ($width > 640 || $height > 640) { $Image->scaleDown(640); - $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, 0, $defperm); + $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, Photo::DEFAULT, $defperm); if ($r) { $smallest = 1; } @@ -243,19 +245,15 @@ function wall_upload_post(App $a, $desktopmode = true) if ($width > 320 || $height > 320) { $Image->scaleDown(320); - $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $defperm); + $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, Photo::DEFAULT, $defperm); if ($r && ($smallest == 0)) { $smallest = 2; } } 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(); @@ -264,11 +262,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(); @@ -277,11 +275,11 @@ function wall_upload_post(App $a, $desktopmode = true) echo json_encode(['picture' => $picture]); exit(); } - Logger::log("upload done", Logger::DEBUG); + Logger::info("upload done"); return $picture; } - Logger::log("upload done", Logger::DEBUG); + Logger::info("upload done"); if ($r_json) { echo json_encode(['ok' => true]);