deblan-mirror/picodav
deblan-mirror/picodav
1
0
Fork 0
mirror of https://github.com/kd2org/picodav.git synced 2024-05-17 21:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with brackets in directory names

Browse source
This commit is contained in:
bohwaz 2022-11-15 13:07:07 +01:00
parent 4fac8cf26f
commit 5aef69423a
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
index.php
View file

@ -1303,13 +1303,19 @@ namespace NanoKaraDAV
$this->path = __DIR__ . '/'; $this->path = __DIR__ . '/';
} }
static protected function glob(string $path, string $pattern = '', int $flags = 0): array
{
$path = preg_replace('/[\*\?\[\]]/', '\\\\$0', $path);
return glob($path . $pattern, $flags);
}
public function list(string $uri, ?array $properties): iterable public function list(string $uri, ?array $properties): iterable
{ {
$dirs = glob($this->path . $uri . '/*', \GLOB_ONLYDIR); $dirs = self::glob($this->path . $uri, '/*', \GLOB_ONLYDIR);
$dirs = array_map('basename', $dirs); $dirs = array_map('basename', $dirs);
natcasesort($dirs); natcasesort($dirs);
$files = glob($this->path . $uri . '/*'); $files = self::glob($this->path . $uri, '/*');
$files = array_map('basename', $files); $files = array_map('basename', $files);
$files = array_diff($files, $dirs); $files = array_diff($files, $dirs);
@ -1486,7 +1492,7 @@ namespace NanoKaraDAV
} }
if (is_dir($target)) { if (is_dir($target)) {
foreach (glob($target . '/*') as $file) { foreach (self::glob($target, '/*') as $file) {
$this->delete(substr($file, strlen($this->path))); $this->delete(substr($file, strlen($this->path)));
} }
@ -1583,7 +1589,7 @@ namespace NanoKaraDAV
$last = 0; $last = 0;
$path = rtrim($path, '/'); $path = rtrim($path, '/');
foreach (glob($path . '/*', GLOB_NOSORT) as $f) { foreach (self::glob($path, '/*', GLOB_NOSORT) as $f) {
if (is_dir($f)) { if (is_dir($f)) {
$m = self::getDirectoryMTime($f); $m = self::getDirectoryMTime($f);
@ -1651,11 +1657,11 @@ namespace {
$fp = fopen(__FILE__, 'r'); $fp = fopen(__FILE__, 'r');
if ($relative_uri == 'webdav.js') { if ($relative_uri == 'webdav.js') {
fseek($fp, 43652, SEEK_SET); fseek($fp, 43873, SEEK_SET);
echo fread($fp, 24265); echo fread($fp, 24265);
} }
else { else {
fseek($fp, 43652 + 24265, SEEK_SET); fseek($fp, 43873 + 24265, SEEK_SET);
echo fread($fp, 6760); echo fread($fp, 6760);
} }

14
server.php
View file

@ -27,13 +27,19 @@ namespace NanoKaraDAV
$this->path = __DIR__ . '/'; $this->path = __DIR__ . '/';
} }
static protected function glob(string $path, string $pattern = '', int $flags = 0): array
{
$path = preg_replace('/[\*\?\[\]]/', '\\\\$0', $path);
return glob($path . $pattern, $flags);
}
public function list(string $uri, ?array $properties): iterable public function list(string $uri, ?array $properties): iterable
{ {
$dirs = glob($this->path . $uri . '/*', \GLOB_ONLYDIR); $dirs = self::glob($this->path . $uri, '/*', \GLOB_ONLYDIR);
$dirs = array_map('basename', $dirs); $dirs = array_map('basename', $dirs);
natcasesort($dirs); natcasesort($dirs);
$files = glob($this->path . $uri . '/*'); $files = self::glob($this->path . $uri, '/*');
$files = array_map('basename', $files); $files = array_map('basename', $files);
$files = array_diff($files, $dirs); $files = array_diff($files, $dirs);
@ -210,7 +216,7 @@ namespace NanoKaraDAV
} }
if (is_dir($target)) { if (is_dir($target)) {
foreach (glob($target . '/*') as $file) { foreach (self::glob($target, '/*') as $file) {
$this->delete(substr($file, strlen($this->path))); $this->delete(substr($file, strlen($this->path)));
} }
@ -307,7 +313,7 @@ namespace NanoKaraDAV
$last = 0; $last = 0;
$path = rtrim($path, '/'); $path = rtrim($path, '/');
foreach (glob($path . '/*', GLOB_NOSORT) as $f) { foreach (self::glob($path, '/*', GLOB_NOSORT) as $f) {
if (is_dir($f)) { if (is_dir($f)) {
$m = self::getDirectoryMTime($f); $m = self::getDirectoryMTime($f);