mirror_html/DirectoryLister
1
0
Fork 0
mirror of https://github.com/DirectoryLister/DirectoryLister.git synced 2025-08-25 23:06:39 +02:00
Code Issues Projects Releases Wiki Activity

Fixed incorrect breadcrumbs when path contains a directory named '0'

Browse Source
This commit is contained in:
Chris Kankiewicz
2020-04-13 12:38:33 -07:00
parent b46aeab614
commit 36911c73cb
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/ViewFunctions/Breadcrumbs.php
View File

@@ -39,19 +39,15 @@ class Breadcrumbs extends ViewFunction
*/
public function __invoke(string $path)
{
$breadcrumbs = Str::explode($path, $this->directorySeparator)->diff(
return Str::explode($path, $this->directorySeparator)->diff(
explode($this->directorySeparator, $this->container->get('base_path'))
)->filter(function ($value): bool {
return $value !== null;
});
return $breadcrumbs->filter(function (string $crumb) {
return $crumb !== '.';
})->reduce(function (Collection $carry, string $crumb) {
)->filter(function (string $crumb): bool {
return ! in_array($crumb, [null, '.']);
})->reduce(function (Collection $carry, string $crumb): Collection {
return $carry->put($crumb, ltrim(
$carry->last() . $this->directorySeparator . rawurlencode($crumb), $this->directorySeparator
));
}, new Collection)->map(function (string $path): string {
}, new Collection)->map(function (string $path, string $name): string {
return sprintf('?dir=%s', $path);
});
}

2
app/views/components/header.twig
View File

@@ -5,7 +5,7 @@
{{ translate('home') }}
</a>
{% if path %}
{% if path is not null %}
{% for name, path in breadcrumbs(path) %}
/ <a href="{{ path }}" class="inline-block hover:underline">{{ name }}</a>
{% endfor %}