GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[UI][NOTE] Post and see attachments

Browse Source
This commit is contained in:
Hugo Sales
2020-08-20 00:40:06 +00:00
committed by Hugo Sales
parent a5cf89674e
commit 6ed89c77f4
4 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Controller/UserPanel.php
View File

@@ -115,7 +115,7 @@ class UserPanel extends AbstractController
if ($form->isSubmitted() && $form->isValid()) {
$data = $form->getData();
$sfile = $file_title = null;
$sfile = null;
if (isset($data['hidden'])) {
// Cropped client side
$matches = [];
@@ -125,12 +125,7 @@ class UserPanel extends AbstractController
$data_user = base64_decode($data_user);
$filename = tempnam('/tmp/', 'avatar');
file_put_contents($filename, $data_user);
try {
$sfile = new SymfonyFile($filename);
$file_title = $data['avatar']->getFilename();
} finally {
// fclose($tmp_file);
}
$sfile = new SymfonyFile($filename);
} else {
Log::info('Avatar upload got an invalid encoding, something\'s fishy and/or wrong');
}
@@ -143,7 +138,7 @@ class UserPanel extends AbstractController
}
$actor = Common::actor();
$actor_id = $actor->getId();
$file = Media::validateAndStoreFile($sfile, Common::config('avatar', 'dir'), $file_title, $is_local = true, $use_unique = $actor_id);
$file = Media::validateAndStoreFile($sfile, Common::config('avatar', 'dir'), $title = null, $is_local = true, $use_unique = $actor_id);
$old_file = null;
$avatar = DB::find('avatar', ['gsactor_id' => $actor_id]);
// Must get old id before inserting another one