diff --git a/mod/update_notes.php b/mod/update_notes.php
index 71650fe21..f195b5362 100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -24,11 +24,11 @@ use Friendica\App;
use Friendica\Core\System;
use Friendica\DI;
-require_once("mod/notes.php");
+require_once 'mod/notes.php';
-function update_notes_content(App $a) {
-
- $profile_uid = intval($_GET["p"]);
+function update_notes_content(App $a)
+{
+ $profile_uid = intval($_GET['p']);
/**
*
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 83d5338da..289c024df 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -20,6 +20,7 @@
*/
use Friendica\App;
+use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
@@ -27,28 +28,30 @@ use Friendica\Model\Attach;
use Friendica\Model\User;
use Friendica\Util\Strings;
-function wall_attach_post(App $a) {
-
- $r_json = (!empty($_GET['response']) && $_GET['response']=='json');
+function wall_attach_post(App $a)
+{
+ $isJson = (!empty($_GET['response']) && $_GET['response'] == 'json');
if (DI::args()->getArgc() > 1) {
- $nick = DI::args()->getArgv()[1];
+ $nick = DI::args()->getArgv()[1];
$owner = User::getOwnerDataByNick($nick);
if (!DBA::isResult($owner)) {
- if ($r_json) {
+ Logger::warning('owner is not a valid record:', ['owner' => $owner, 'nick' => $nick]);
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
return;
}
} else {
- if ($r_json) {
+ Logger::warning('Argument count is zero or one (invalid)');
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
return;
}
- $can_post = false;
+ $can_post = false;
$page_owner_uid = $owner['uid'];
$page_owner_cid = $owner['id'];
@@ -58,11 +61,12 @@ function wall_attach_post(App $a) {
$can_post = true;
} 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]);
+ $can_post = DBA::exists('contact', ['blocked' => false, 'pending' => false, 'id' => $contact_id, 'uid' => $page_owner_uid]);
}
if (!$can_post) {
- if ($r_json) {
+ Logger::warning('User does not have required permissions', ['contact_id' => $contact_id, 'page_owner_uid' => $page_owner_uid]);
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]);
}
DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
@@ -70,28 +74,28 @@ function wall_attach_post(App $a) {
}
if (empty($_FILES['userfile'])) {
- if ($r_json) {
+ Logger::warning('No file uploaded (empty userfile)');
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
System::exit();
}
- $src = $_FILES['userfile']['tmp_name'];
- $filename = basename($_FILES['userfile']['name']);
- $filesize = intval($_FILES['userfile']['size']);
+ $tempFileName = $_FILES['userfile']['tmp_name'];
+ $fileName = basename($_FILES['userfile']['name']);
+ $fileSize = intval($_FILES['userfile']['size']);
+ $maxFileSize = DI::config()->get('system', 'maxfilesize');
- $maxfilesize = DI::config()->get('system','maxfilesize');
-
- /* Found html code written in text field of form,
- * when trying to upload a file with filesize
- * greater than upload_max_filesize. Cause is unknown.
+ /*
+ * Found html code written in text field of form, when trying to upload a
+ * file with filesize greater than upload_max_filesize. Cause is unknown.
* Then Filesize gets <= 0.
*/
-
- if ($filesize <= 0) {
- $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . '
' . (DI::l10n()->t('Or - did you try to upload an empty file?'));
- @unlink($src);
- if ($r_json) {
+ if ($fileSize <= 0) {
+ $msg = DI::l10n()->t('Sorry, maybe your upload is bigger than the PHP configuration allows') . '
' . DI::l10n()->t('Or - did you try to upload an empty file?');
+ Logger::warning($msg, ['fileSize' => $fileSize]);
+ @unlink($tempFileName);
+ if ($isJson) {
System::jsonExit(['error' => $msg]);
} else {
DI::sysmsg()->addNotice($msg);
@@ -99,10 +103,11 @@ function wall_attach_post(App $a) {
System::exit();
}
- if ($maxfilesize && $filesize > $maxfilesize) {
- $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxfilesize));
- @unlink($src);
- if ($r_json) {
+ if ($maxFileSize && $fileSize > $maxFileSize) {
+ $msg = DI::l10n()->t('File exceeds size limit of %s', Strings::formatBytes($maxFileSize));
+ Logger::warning($msg, ['fileSize' => $fileSize]);
+ @unlink($tempFileName);
+ if ($isJson) {
System::jsonExit(['error' => $msg]);
} else {
echo $msg . '
';
@@ -110,13 +115,14 @@ function wall_attach_post(App $a) {
System::exit();
}
- $newid = Attach::storeFile($src, $page_owner_uid, $filename, '<' . $page_owner_cid . '>');
+ $newid = Attach::storeFile($tempFileName, $page_owner_uid, $fileName, '<' . $page_owner_cid . '>');
- @unlink($src);
+ @unlink($tempFileName);
if ($newid === false) {
- $msg = DI::l10n()->t('File upload failed.');
- if ($r_json) {
+ $msg = DI::l10n()->t('File upload failed.');
+ Logger::warning($msg);
+ if ($isJson) {
System::jsonExit(['error' => $msg]);
} else {
echo $msg . '
';
@@ -124,7 +130,7 @@ function wall_attach_post(App $a) {
System::exit();
}
- if ($r_json) {
+ if ($isJson) {
System::jsonExit(['ok' => true, 'id' => $newid]);
}
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index c5575da97..bdb317048 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -39,17 +39,18 @@ use Friendica\Util\Strings;
function wall_upload_post(App $a, $desktopmode = true)
{
- Logger::info("wall upload: starting new upload");
+ Logger::info('wall upload: starting new upload');
- $r_json = (!empty($_GET['response']) && $_GET['response'] == 'json');
- $album = trim($_GET['album'] ?? '');
+ $isJson = (!empty($_GET['response']) && $_GET['response'] == 'json');
+ $album = trim($_GET['album'] ?? '');
if (DI::args()->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) {
+ Logger::warning('wall upload: user instance is not valid', ['user' => $user, 'nickname' => $nick]);
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
return;
@@ -58,7 +59,8 @@ function wall_upload_post(App $a, $desktopmode = true)
$user = DBA::selectFirst('owner-view', ['id', 'uid', 'nickname', 'page-flags'], ['uid' => BaseApi::getCurrentUserID(), 'blocked' => false]);
}
} else {
- if ($r_json) {
+ Logger:warning('Argument count is zero or one (invalid)');
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
return;
@@ -67,47 +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 ((DI::userSession()->getLocalUserId()) && (DI::userSession()->getLocalUserId() == $page_owner_uid)) {
$can_post = true;
} 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;
+ $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) {
- System::jsonExit(['error' => DI::l10n()->t('Permission denied.')]);
+ 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]);
}
- DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
+ DI::sysmsg()->addNotice($msg);
System::exit();
}
if (empty($_FILES['userfile']) && empty($_FILES['media'])) {
- if ($r_json) {
+ Logger::warning('Empty "userfile" and "media" field');
+ if ($isJson) {
System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
}
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'])) {
@@ -142,29 +147,36 @@ function wall_upload_post(App $a, $desktopmode = true)
}
}
- if ($src == "") {
- if ($r_json) {
- System::jsonExit(['error' => DI::l10n()->t('Invalid request.')]);
+ if ($src == '') {
+ Logger::warning('File source (temporary file) cannot be determined');
+ $msg = DI::l10n()->t('Invalid request.');
+ if ($isJson) {
+ System::jsonExit(['error' => $msg]);
}
- DI::sysmsg()->addNotice(DI::l10n()->t('Invalid request.'));
+ DI::sysmsg()->addNotice($msg);
System::exit();
}
$filetype = Images::getMimeTypeBySource($src, $filename, $filetype);
- Logger::info("File upload src: " . $src . " - filename: " . $filename .
- " - size: " . $filesize . " - type: " . $filetype);
+ 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()) {
$msg = DI::l10n()->t('Unable to process image.');
+ Logger::warning($msg, ['imagedata[]' => gettype($imagedata), 'filetype' => $filetype]);
@unlink($src);
- if ($r_json) {
+ if ($isJson) {
System::jsonExit(['error' => $msg]);
} else {
- echo $msg . '
';
+ echo $msg . '
';
}
System::exit();
}
@@ -176,10 +188,10 @@ function wall_upload_post(App $a, $desktopmode = true)
if ($max_length > 0) {
$image->scaleDown($max_length);
$filesize = strlen($image->asString());
- Logger::info("File upload: Scaling picture to new size " . $max_length);
+ Logger::info('File upload: Scaling picture to new size', ['max_length' => $max_length]);
}
- $width = $image->getWidth();
+ $width = $image->getWidth();
$height = $image->getHeight();
$maximagesize = DI::config()->get('system', 'maximagesize');
@@ -191,15 +203,15 @@ function wall_upload_post(App $a, $desktopmode = true)
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();
+ $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));
@unlink($src);
- if ($r_json) {
+ if ($isJson) {
System::jsonExit(['error' => $msg]);
} else {
echo $msg . '
';
@@ -223,7 +235,8 @@ function wall_upload_post(App $a, $desktopmode = true)
if (!$r) {
$msg = DI::l10n()->t('Image upload failed.');
- if ($r_json) {
+ Logger::warning('Photo::store() failed', ['r' => $r]);
+ if ($isJson) {
System::jsonExit(['error' => $msg]);
} else {
echo $msg . '
';
@@ -250,32 +263,34 @@ function wall_upload_post(App $a, $desktopmode = true)
if (!$desktopmode) {
$photo = Photo::selectFirst(['id', 'datasize', 'width', 'height', 'type'], ['resource-id' => $resource_id], ['order' => ['width']]);
if (!$photo) {
- if ($r_json) {
- System::jsonExit(['error' => '']);
+ Logger::warning('Cannot find photo in database', ['resource-id' => $resource_id]);
+ if ($isJson) {
+ System::jsonExit(['error' => 'Cannot find photo']);
}
return false;
}
- $picture = [];
- $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();
+ $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 ($r_json) {
+ if ($isJson) {
System::jsonExit(['picture' => $picture]);
}
- Logger::info("upload done");
+ Logger::info('upload done');
return $picture;
}
- Logger::info("upload done");
+ Logger::info('upload done');
- if ($r_json) {
+ if ($isJson) {
System::jsonExit(['ok' => true]);
}