X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fwall_upload.php;h=bdb317048a826b06e422a35ae28290c786afaba6;hb=3865733e18421126de45ca91f221aebd628b1ccc;hp=d935c6d327fa6cb2b06819e345b579c962ea2de7;hpb=3d97149007872d69ca43ec955137b887d95239cf;p=friendica.git
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index d935c6d327..bdb317048a 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,6 @@
getArgc() > 1) {
if (empty($_FILES['media'])) {
- $nick = DI::args()->getArgv()[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) {
- echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
- exit();
+ Logger::warning('wall upload: user instance is not valid', ['user' => $user, 'nickname' => $nick]);
+ if ($isJson) {
+ System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
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) {
- echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
- exit();
+ Logger:warning('Argument count is zero or one (invalid)');
+ if ($isJson) {
+ System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
return;
}
@@ -69,48 +69,50 @@ function wall_upload_post(App $a, $desktopmode = true)
/*
* Setup permissions structures
*/
- $can_post = false;
- $visitor = 0;
+ $can_post = false;
+ $visitor = 0;
- $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);
+ $page_owner_uid = $user['uid'];
+ $default_cid = $user['id'];
+ $page_owner_nick = $user['nickname'];
+ $community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY);
- if ((local_user()) && (local_user() == $page_owner_uid)) {
+ if ((DI::userSession()->getLocalUserId()) && (DI::userSession()->getLocalUserId() == $page_owner_uid)) {
$can_post = true;
- } elseif ($community_page && !empty(Session::getRemoteContactID($page_owner_uid))) {
- $contact_id = Session::getRemoteContactID($page_owner_uid);
- $can_post = DBA::exists('contact', ['blocked' => false, 'pending' => false, 'id' => $contact_id, 'uid' => $page_owner_uid]);
- $visitor = $contact_id;
+ } elseif ($community_page && !empty(DI::userSession()->getRemoteContactID($page_owner_uid))) {
+ $contact_id = DI::userSession()->getRemoteContactID($page_owner_uid);
+ $can_post = DBA::exists('contact', ['blocked' => false, 'pending' => false, 'id' => $contact_id, 'uid' => $page_owner_uid]);
+ $visitor = $contact_id;
}
if (!$can_post) {
- if ($r_json) {
- echo json_encode(['error' => DI::l10n()->t('Permission denied.')]);
- exit();
+ Logger::warning('No permission to upload files', ['contact_id' => $contact_id, 'page_owner_uid' => $page_owner_uid]);
+ $msg = DI::l10n()->t('Permission denied.');
+ if ($isJson) {
+ System::jsonExit(['error' => $msg]);
}
- notice(DI::l10n()->t('Permission denied.'));
- exit();
+ DI::sysmsg()->addNotice($msg);
+ System::exit();
}
if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
- if ($r_json) {
- echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
+ Logger::warning('Empty "userfile" and "media" field');
+ if ($isJson) {
+ System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
- exit();
+ System::exit();
}
- $src = '';
+ $src = '';
$filename = '';
$filesize = 0;
$filetype = '';
+
if (!empty($_FILES['userfile'])) {
$src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type'];
-
} elseif (!empty($_FILES['media'])) {
if (!empty($_FILES['media']['tmp_name'])) {
if (is_array($_FILES['media']['tmp_name'])) {
@@ -145,49 +147,52 @@ function wall_upload_post(App $a, $desktopmode = true)
}
}
- if ($src == "") {
- if ($r_json) {
- echo json_encode(['error' => DI::l10n()->t('Invalid request.')]);
- exit();
+ if ($src == '') {
+ Logger::warning('File source (temporary file) cannot be determined');
+ $msg = DI::l10n()->t('Invalid request.');
+ if ($isJson) {
+ System::jsonExit(['error' => $msg]);
}
- notice(DI::l10n()->t('Invalid request.'));
- exit();
+ DI::sysmsg()->addNotice($msg);
+ System::exit();
}
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
- Logger::log("File upload src: " . $src . " - filename: " . $filename .
- " - size: " . $filesize . " - type: " . $filetype, Logger::DEBUG);
+ Logger::info('File upload:', [
+ 'src' => $src,
+ 'filename' => $filename,
+ 'filesize' => $filesize,
+ 'filetype' => $filetype,
+ ]);
$imagedata = @file_get_contents($src);
- $Image = new Image($imagedata, $filetype);
+ $image = new Image($imagedata, $filetype);
- if (!$Image->isValid()) {
+ if (!$image->isValid()) {
$msg = DI::l10n()->t('Unable to process image.');
- if ($r_json) {
- echo json_encode(['error' => $msg]);
+ Logger::warning($msg, ['imagedata[]' => gettype($imagedata), 'filetype' => $filetype]);
+ @unlink($src);
+ if ($isJson) {
+ System::jsonExit(['error' => $msg]);
} else {
- echo $msg. EOL;
+ echo $msg . '
';
}
- @unlink($src);
- exit();
+ System::exit();
}
- $Image->orient($src);
+ $image->orient($src);
@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);
- $filesize = strlen($Image->asString());
- Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG);
+ $image->scaleDown($max_length);
+ $filesize = strlen($image->asString());
+ Logger::info('File upload: Scaling picture to new size', ['max_length' => $max_length]);
}
- $width = $Image->getWidth();
- $height = $Image->getHeight();
+ $width = $image->getWidth();
+ $height = $image->getHeight();
$maximagesize = DI::config()->get('system', 'maximagesize');
@@ -196,22 +201,22 @@ function wall_upload_post(App $a, $desktopmode = true)
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();
+ $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]);
+ @unlink($src);
+ if ($isJson) {
+ System::jsonExit(['error' => $msg]);
} else {
- echo $msg. EOL;
+ echo $msg . '
';
}
- @unlink($src);
- exit();
+ System::exit();
}
}
@@ -226,74 +231,70 @@ 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.');
- if ($r_json) {
- echo json_encode(['error' => $msg]);
+ Logger::warning('Photo::store() failed', ['r' => $r]);
+ if ($isJson) {
+ System::jsonExit(['error' => $msg]);
} else {
- echo $msg. EOL;
+ echo $msg . '
';
}
- exit();
+ System::exit();
}
if ($width > 640 || $height > 640) {
- $Image->scaleDown(640);
- $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, 0, $defperm);
+ $image->scaleDown(640);
+ $r = Photo::store($image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 1, Photo::DEFAULT, $defperm);
if ($r) {
$smallest = 1;
}
}
if ($width > 320 || $height > 320) {
- $Image->scaleDown(320);
- $r = Photo::store($Image, $page_owner_uid, $visitor, $resource_id, $filename, $album, 2, 0, $defperm);
+ $image->scaleDown(320);
+ $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) {
- if ($r_json) {
- echo json_encode(['error' => '']);
- exit();
+ $photo = Photo::selectFirst(['id', 'datasize', 'width', 'height', 'type'], ['resource-id' => $resource_id], ['order' => ['width']]);
+ if (!$photo) {
+ Logger::warning('Cannot find photo in database', ['resource-id' => $resource_id]);
+ if ($isJson) {
+ System::jsonExit(['error' => 'Cannot find photo']);
}
return false;
}
- $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["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();
-
- if ($r_json) {
- echo json_encode(['picture' => $picture]);
- exit();
+
+ $picture = [
+ 'id' => $photo['id'],
+ 'size' => $photo['datasize'],
+ 'width' => $photo['width'],
+ 'height' => $photo['height'],
+ 'type' => $photo['type'],
+ 'albumpage' => DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id,
+ 'picture' => DI::baseUrl() . "/photo/{$resource_id}-0." . $image->getExt(),
+ 'preview' => DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $image->getExt(),
+ ];
+
+ if ($isJson) {
+ System::jsonExit(['picture' => $picture]);
}
- 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]);
- exit();
+ if ($isJson) {
+ System::jsonExit(['ok' => true]);
}
- echo "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n";
- exit();
+ echo "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $image->getExt() . "[/img][/url]\n\n";
+ System::exit();
// NOTREACHED
}