Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 12:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from Terranom674/fix/root-selection-09617

Browse Source 
0.9.6.17: Nextcloud-Stammverzeichnis als WebDAV-Quelle zulassen
This commit is contained in:
Terranom674
2026-08-19 15:19:39 +02:00
committed by GitHub
parent 47813b0b0e 2029059720
commit a047fc0d83
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/nc_connector_webdav.inc.php
View File

@@ -104,7 +104,6 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
$selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
? $state['directory_selected_fileids']
: array();
$selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
$roots = array();
@@ -112,9 +111,12 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
{
$fileid = isset($selected_ids[$path]) ? (int)$selected_ids[$path] : 0;
if ($fileid < 1) throw new RuntimeException('Für ein ausgewähltes Nextcloud-Verzeichnis fehlt die eindeutige Datei-ID.');
$display_name = $path === ''
? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : $username)
: basename($path);
$roots[] = array(
'fileid'=>$fileid,
'display_name'=>basename($path),
'display_name'=>$display_name,
'webdav_path'=>$path,
);
}

6
include/nc_connector_wizard_webdav_flow.inc.php
View File

@@ -126,7 +126,6 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
$selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
? array_values(array_unique(array_map(function($path) { return trim((string)$path, '/'); }, $state['directory_selected'])))
: array();
$selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
if (!$selected)
{
throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
@@ -143,9 +142,12 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
{
throw new RuntimeException('Für eine Auswahl fehlt die eindeutige Nextcloud-Datei-ID. Bitte das Verzeichnis erneut auswählen.');
}
$display_name = $path === ''
? (trim((string)($state['display_name'] ?? '')) !== '' ? trim((string)$state['display_name']) : (string)$state['username'])
: basename($path);
$roots[] = array(
'fileid'=>$fileid,
'display_name'=>basename($path),
'display_name'=>$display_name,
'webdav_path'=>$path,
);
}

2
main.inc.php
View File

@@ -1,7 +1,7 @@
<?php
/*
Plugin Name: Bratonien Tools
Version: 0.9.6.16
Version: 0.9.6.17
Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
Author: Bratonien