extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Filemanager: automatic shorten too long filenames and replace 4-byte utf-8 characters, which gave an error when trying to store VFS

Browse Source
This commit is contained in:
ralf 2024-06-20 12:29:13 +02:00
parent 230f3953a6
commit bd0818b7e1
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/Vfs.php
View File

@ -1795,6 +1795,19 @@ class Vfs extends Vfs\Base
return str_replace(array_keys(self::$encode),array_values(self::$encode),$component);
}
/**
* Limit filename to precision of column while keeping the extension
*
* Also takes care to replace 4-byte utf-8 chars e.g. used in some Emojis with a replacement character.
*
* @param string $name
* @return string
*/
static public function limitFilename($name)
{
return Vfs\Sqlfs\StreamWrapper::limit_filename($name);
}
/**
* Encode a path: replacing certain chars with their urlencoded counterparts
*

12
api/src/Vfs/Sqlfs/StreamWrapper.php
View File

@ -1767,16 +1767,26 @@ GROUP BY A.fs_id';
/**
* Limit filename to precision of column while keeping the extension
*
* Also takes care to replace 4-byte utf-8 chars e.g. used in some Emojis with a replacement character.
*
* @param string $name
* @return string
*/
static protected function limit_filename($name)
static public function limit_filename($name)
{
static $fs_name_precision = null;
if (!isset($fs_name_precision))
{
$fs_name_precision = $GLOBALS['egw']->db->get_column_attribute('fs_name', self::TABLE, 'phpgwapi', 'precision');
}
// MySQL and MariaDB not 10.1 need 4-byte utf8 chars replaced with our default utf8 charset
// (MariaDB 10.1 does the replacement automatic, 10.0 cuts everything off behind and MySQL gives an error)
// (MariaDB 10.3 gives an error too: Incorrect string value: '\xF0\x9F\x98\x8A\x0AW...')
// Changing charset to utf8mb4 requires schema update, shortening of some indexes and probably have negative impact on performance!
if (isset($name) && substr($GLOBALS['egw']->db->Type, 0, 5) === 'mysql')
{
$name = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $name);
}
if (mb_strlen($name) > $fs_name_precision)
{
$parts = explode('.', $name);

2
filemanager/inc/class.filemanager_ui.inc.php
View File

@ -1755,7 +1755,7 @@ class filemanager_ui
foreach($selected as $tmp_name => &$data)
{
$path = Vfs::concat($dir, Vfs::encodePathComponent($data['name']));
$path = Vfs::concat($dir, Vfs::limitFilename(Vfs::encodePathComponent($data['name'])));
if(Vfs::deny_script($path))
{