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

filename_base option isn't optimal

Browse Source 
For different "download filenames" we should use some other method.
This commit is contained in:
Mikael Nordfeldth 2016-03-05 11:59:46 +01:00
parent 204a8f1fcc
commit 1db02d7f36
2 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/default.php
View File

@ -263,7 +263,6 @@ $default =
'user_quota' => 50000000, 'user_quota' => 50000000,
'monthly_quota' => 15000000, 'monthly_quota' => 15000000,
'uploads' => true, 'uploads' => true,
'filename_base' => 'hash', // for new files, choose one: 'upload', 'hash'
'show_html' => false, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls. 'show_html' => false, // show (filtered) text/html attachments (and oEmbed HTML etc.). Doesn't affect AJAX calls.
'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info 'show_thumbs' => true, // show thumbnails in notice lists for uploaded images, and photos and videos linked remotely that provide oEmbed info
'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages. 'process_links' => true, // check linked resources for embeddable photos and videos; this will hit referenced external web sites when processing new messages.

44
lib/mediafile.php
View File

@ -42,10 +42,8 @@ class MediaFile
var $short_fileurl = null; var $short_fileurl = null;
var $mimetype = null; var $mimetype = null;
function __construct(Profile $scoped, $filename = null, $mimetype = null, $filehash = null) function __construct($filename = null, $mimetype = null, $filehash = null)
{ {
$this->scoped = $scoped;
$this->filename = $filename; $this->filename = $filename;
$this->mimetype = $mimetype; $this->mimetype = $mimetype;
$this->filehash = $filehash; $this->filehash = $filehash;
@ -189,10 +187,6 @@ class MediaFile
static function fromUpload($param='media', Profile $scoped=null) static function fromUpload($param='media', Profile $scoped=null)
{ {
if (is_null($scoped)) {
$scoped = Profile::current();
}
// The existence of the "error" element means PHP has processed it properly even if it was ok. // The existence of the "error" element means PHP has processed it properly even if it was ok.
if (!isset($_FILES[$param]) || !isset($_FILES[$param]['error'])) { if (!isset($_FILES[$param]) || !isset($_FILES[$param]['error'])) {
throw new NoUploadedMediaException($param); throw new NoUploadedMediaException($param);
@ -248,21 +242,16 @@ class MediaFile
} catch (NoResultException $e) { } catch (NoResultException $e) {
// We have to save the upload as a new local file. This is the normal course of action. // We have to save the upload as a new local file. This is the normal course of action.
// Throws exception if additional size does not respect quota if ($scoped instanceof Profile) {
// This test is only needed, of course, if we're uploading something new. // Throws exception if additional size does not respect quota
File::respectsQuota($scoped, $_FILES[$param]['size']); // This test is only needed, of course, if we're uploading something new.
File::respectsQuota($scoped, $_FILES[$param]['size']);
}
$mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'], $_FILES[$param]['name']); $mimetype = self::getUploadedMimeType($_FILES[$param]['tmp_name'], $_FILES[$param]['name']);
$basename = basename($_FILES[$param]['name']); $basename = basename($_FILES[$param]['name']);
switch (common_config('attachments', 'filename_base')) { $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype, $basename);
case 'upload':
$filename = File::filename($scoped, $basename, $mimetype);
break;
case 'hash':
default:
$filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype, $basename);
}
$filepath = File::path($filename); $filepath = File::path($filename);
$result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath); $result = move_uploaded_file($_FILES[$param]['tmp_name'], $filepath);
@ -274,10 +263,10 @@ class MediaFile
} }
} }
return new MediaFile($scoped, $filename, $mimetype, $filehash); return new MediaFile($filename, $mimetype, $filehash);
} }
static function fromFilehandle($fh, Profile $scoped) { static function fromFilehandle($fh, Profile $scoped=null) {
$stream = stream_get_meta_data($fh); $stream = stream_get_meta_data($fh);
// So far we're only handling filehandles originating from tmpfile(), // So far we're only handling filehandles originating from tmpfile(),
// so we can always do hash_file on $stream['uri'] as far as I can tell! // so we can always do hash_file on $stream['uri'] as far as I can tell!
@ -312,18 +301,13 @@ class MediaFile
$mimetype = $file->mimetype; $mimetype = $file->mimetype;
} catch (NoResultException $e) { } catch (NoResultException $e) {
File::respectsQuota($scoped, filesize($stream['uri'])); if ($scoped instanceof Profile) {
File::respectsQuota($scoped, filesize($stream['uri']));
}
$mimetype = self::getUploadedMimeType($stream['uri']); $mimetype = self::getUploadedMimeType($stream['uri']);
switch (common_config('attachments', 'filename_base')) { $filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype);
case 'upload':
$filename = File::filename($scoped, "email", $mimetype);
break;
case 'hash':
default:
$filename = strtolower($filehash) . '.' . File::guessMimeExtension($mimetype);
}
$filepath = File::path($filename); $filepath = File::path($filename);
$result = copy($stream['uri'], $filepath) && chmod($filepath, 0664); $result = copy($stream['uri'], $filepath) && chmod($filepath, 0664);
@ -336,7 +320,7 @@ class MediaFile
} }
} }
return new MediaFile($scoped, $filename, $mimetype, $filehash); return new MediaFile($filename, $mimetype, $filehash);
} }
/** /**