mirror of
https://github.com/nextcloud/server.git
synced 2026-02-03 20:41:22 -05:00
a721d346b9
Directory entry file names are now normalized in getMetaData(), getDirectoryContents() and opendir(). This makes the scanner work properly as it assumes pre-normalized names. In case the names were not normalized, the scanner will now skip the entries and display a warning when applicable. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
55 lines
1.4 KiB
PHP
55 lines
1.4 KiB
PHP
<?php
|
|
/**
|
|
* @copyright Copyright (c) 2021, Nextcloud GmbH.
|
|
*
|
|
* @author Robin Appelman <robin@icewind.nl>
|
|
* @author Vincent Petry <vincent@nextcloud.com>
|
|
*
|
|
* @license AGPL-3.0
|
|
*
|
|
* This code is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License, version 3,
|
|
* as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Affero General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Affero General Public License, version 3,
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
*
|
|
*/
|
|
|
|
namespace OC\Files\Storage\Wrapper;
|
|
|
|
use Icewind\Streams\DirectoryWrapper;
|
|
use OC\Files\Filesystem;
|
|
|
|
/**
|
|
* Normalize file names while reading directory entries
|
|
*/
|
|
class EncodingDirectoryWrapper extends DirectoryWrapper {
|
|
/**
|
|
* @return string
|
|
*/
|
|
public function dir_readdir() {
|
|
$file = readdir($this->source);
|
|
if ($file !== false && $file !== '.' && $file !== '..') {
|
|
$file = trim(Filesystem::normalizePath($file), '/');
|
|
}
|
|
|
|
return $file;
|
|
}
|
|
|
|
/**
|
|
* @param resource $source
|
|
* @param callable $filter
|
|
* @return resource|bool
|
|
*/
|
|
public static function wrap($source) {
|
|
return self::wrapSource($source, [
|
|
'source' => $source,
|
|
]);
|
|
}
|
|
}
|