mirror of
https://github.com/Terranom674/Piwigo_Bratonien_Tools.git
synced 2026-09-19 19:54:31 +00:00
Compare commits
74 Commits
abd0cc5d21
...
fix/nc-ui-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
72a3267ed3 | ||
|
|
99479d5d03 | ||
|
|
51089c3446 | ||
|
|
c8d846f289 | ||
|
|
2603a8929c | ||
|
|
afd8620859 | ||
|
|
72db8b48eb | ||
|
|
1a0f8c61e8 | ||
|
|
d4e3e7faab | ||
|
|
03e92b74a7 | ||
|
|
88c787c956 | ||
|
|
3f5f8dc4b4 | ||
|
|
495edbbb70 | ||
|
|
3d5e6c82ea | ||
|
|
ae815bc077 | ||
|
|
936a1cf3c4 | ||
|
|
ff0c1e0bec | ||
|
|
a047fc0d83 | ||
|
|
2029059720 | ||
|
|
1eca236509 | ||
|
|
e464668343 | ||
|
|
47813b0b0e | ||
|
|
26af1b3019 | ||
|
|
b1b75676a8 | ||
|
|
12880b6c41 | ||
|
|
32abc7250d | ||
|
|
76de2b037c | ||
|
|
e2e82162c6 | ||
|
|
7a9eb1baa6 | ||
|
|
e800f11f64 | ||
|
|
4808f08590 | ||
|
|
6fd89df5d0 | ||
|
|
99126088e7 | ||
|
|
e53a3848bb | ||
|
|
0f0c71acaf | ||
|
|
9847690f50 | ||
|
|
a2f5dc3919 | ||
|
|
cd3bf7c8ee | ||
|
|
79ea403555 | ||
|
|
33783dd30f | ||
|
|
ca6a5cf96f | ||
|
|
62ada617fb | ||
|
|
898f9b1bc9 | ||
|
|
5b48e1f6f2 | ||
|
|
fdf4584028 | ||
|
|
880744a8b7 | ||
|
|
2ed84ad089 | ||
|
|
60c0a51f01 | ||
|
|
84d263b16b | ||
|
|
94c81789ed | ||
|
|
e3b1f06be3 | ||
|
|
15a3ceb01c | ||
|
|
0f5812a179 | ||
|
|
377b29a127 | ||
|
|
d9696172c5 | ||
|
|
3f2a85fb0b | ||
|
|
c882ba994b | ||
|
|
cd2c9e350b | ||
|
|
394f375e91 | ||
|
|
3b1ccd99a5 | ||
|
|
04d88cd40f | ||
|
|
a4f953551c | ||
|
|
b4161471ca | ||
|
|
71fdadb7f8 | ||
|
|
98134b5ab8 | ||
|
|
5f82f2ad71 | ||
|
|
494f8bf192 | ||
|
|
c46f9bb5bd | ||
|
|
992cb55714 | ||
|
|
46782ea9a3 | ||
|
|
d03410c9ef | ||
|
|
aa2a6e4c02 | ||
|
|
ebdd77fb0a | ||
|
|
6c36aaeb8a |
34
.github/workflows/lint.yml
vendored
34
.github/workflows/lint.yml
vendored
@@ -5,8 +5,12 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
syntax:
|
php-syntax:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
php-version: ['8.2', '8.3', '8.4', '8.5']
|
||||||
steps:
|
steps:
|
||||||
- name: Repository auschecken
|
- name: Repository auschecken
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
@@ -14,7 +18,7 @@ jobs:
|
|||||||
- name: PHP installieren
|
- name: PHP installieren
|
||||||
uses: shivammathur/setup-php@v2
|
uses: shivammathur/setup-php@v2
|
||||||
with:
|
with:
|
||||||
php-version: '8.2'
|
php-version: ${{ matrix.php-version }}
|
||||||
coverage: none
|
coverage: none
|
||||||
|
|
||||||
- name: PHP Syntax pruefen
|
- name: PHP Syntax pruefen
|
||||||
@@ -25,6 +29,32 @@ jobs:
|
|||||||
php -l "$file"
|
php -l "$file"
|
||||||
done < <(find . -type f -name '*.php' -print0)
|
done < <(find . -type f -name '*.php' -print0)
|
||||||
|
|
||||||
|
- name: Doppelte Bratonien-Funktionen pruefen
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
duplicates="$(grep -RhoE 'function[[:space:]]+bratonien_tools_[A-Za-z0-9_]+' --include='*.php' . | awk '{print $2}' | sort | uniq -d || true)"
|
||||||
|
if [[ -n "$duplicates" ]]; then
|
||||||
|
echo "Doppelte globale Bratonien-Funktionen gefunden:" >&2
|
||||||
|
printf '%s\n' "$duplicates" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
script-syntax:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Repository auschecken
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Admin JavaScript Syntax pruefen
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
sed -n '/<script>/,/<\/script>/p' template/admin_tabs.tpl | sed '1d;$d' > /tmp/bratonien-admin-tabs.js
|
||||||
|
node --check /tmp/bratonien-admin-tabs.js
|
||||||
|
node --check js/nc_connector_edit_v2.js
|
||||||
|
node --check js/nc_connector_source_ui.js
|
||||||
|
|
||||||
- name: Python Syntax pruefen
|
- name: Python Syntax pruefen
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -5,6 +5,11 @@ if (!defined('PHPWG_ROOT_PATH'))
|
|||||||
}
|
}
|
||||||
|
|
||||||
function bratonien_tools_nc_connector_create_local_api_first()
|
function bratonien_tools_nc_connector_create_local_api_first()
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Neue Verbindungen über die alte lokale PostgreSQL-/Storage-Struktur sind ab 0.9.6.2 gesperrt. Bestehende lokale Verbindungen bleiben für die schrittweise Migration weiterhin aktiv. Neue Verbindungen müssen über den WebDAV-Assistenten angelegt werden.');
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_create_local_api_first_legacy()
|
||||||
{
|
{
|
||||||
$required = array(
|
$required = array(
|
||||||
'nc_name' => 'Name',
|
'nc_name' => 'Name',
|
||||||
|
|||||||
348
include/nc_connector_edit.inc.php
Normal file
348
include/nc_connector_edit.inc.php
Normal file
@@ -0,0 +1,348 @@
|
|||||||
|
<?php
|
||||||
|
if (!defined('PHPWG_ROOT_PATH'))
|
||||||
|
{
|
||||||
|
die('Hacking attempt!');
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_migration_state(array $connection)
|
||||||
|
{
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
$missing = array();
|
||||||
|
|
||||||
|
if (trim((string)($config['nextcloud_url'] ?? '')) === '') $missing[] = 'Nextcloud-Adresse';
|
||||||
|
if (trim((string)($credentials['nextcloud_user'] ?? '')) === '') $missing[] = 'Nextcloud-Benutzer';
|
||||||
|
if ((string)($credentials['nextcloud_password'] ?? '') === '') $missing[] = 'Nextcloud-Passwort';
|
||||||
|
|
||||||
|
$api_id = trim((string)($credentials['api_key_id'] ?? ''));
|
||||||
|
$api_secret = trim((string)($credentials['api_key_secret'] ?? ''));
|
||||||
|
$fallback_user = trim((string)($credentials['piwigo_user'] ?? ''));
|
||||||
|
$fallback_password = (string)($credentials['piwigo_password'] ?? '');
|
||||||
|
$api_complete = $api_id !== '' && $api_secret !== '';
|
||||||
|
$fallback_complete = $fallback_user !== '' && $fallback_password !== '';
|
||||||
|
|
||||||
|
if (($api_id === '') !== ($api_secret === '')) $missing[] = 'vollstaendiger Piwigo-API-Zugang';
|
||||||
|
if (!$api_complete && !$fallback_complete) $missing[] = 'Piwigo-API oder Benutzer/Passwort-Fallback';
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'ready'=>!$missing,
|
||||||
|
'missing'=>$missing,
|
||||||
|
'api_available'=>$api_complete,
|
||||||
|
'fallback_available'=>$fallback_complete,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_validate_nextcloud_access($base_url, $username, $password)
|
||||||
|
{
|
||||||
|
$base_url = bratonien_tools_nc_wizard_normalize_url($base_url);
|
||||||
|
$username = trim((string)$username);
|
||||||
|
$password = (string)$password;
|
||||||
|
if ($username === '' || $password === '') throw new RuntimeException('Nextcloud-Benutzer und Passwort werden benoetigt.');
|
||||||
|
|
||||||
|
$status_response = bratonien_tools_nc_wizard_http($base_url.'/status.php');
|
||||||
|
if ($status_response['status'] < 200 || $status_response['status'] >= 300)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die Nextcloud-Adresse konnte nicht bestaetigt werden.');
|
||||||
|
}
|
||||||
|
$status = json_decode((string)$status_response['body'], true);
|
||||||
|
if (!is_array($status) || empty($status['installed']))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Unter dieser Adresse wurde keine installierte Nextcloud erkannt.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$user_response = bratonien_tools_nc_wizard_http(
|
||||||
|
$base_url.'/ocs/v2.php/cloud/user?format=json',
|
||||||
|
$username,
|
||||||
|
$password,
|
||||||
|
array('OCS-APIRequest: true')
|
||||||
|
);
|
||||||
|
if ($user_response['status'] === 401 || $user_response['status'] === 403)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Nextcloud hat Benutzername oder Passwort abgelehnt.');
|
||||||
|
}
|
||||||
|
if ($user_response['status'] < 200 || $user_response['status'] >= 300)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Nextcloud ist erreichbar, aber der Benutzerzugang konnte nicht geprueft werden.');
|
||||||
|
}
|
||||||
|
$user_data = bratonien_tools_nc_wizard_ocs_data($user_response['body']);
|
||||||
|
$resolved = trim((string)($user_data['id'] ?? $username));
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'base_url'=>$base_url,
|
||||||
|
'username'=>$resolved !== '' ? $resolved : $username,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret)
|
||||||
|
{
|
||||||
|
$api_key_id = trim((string)$api_key_id);
|
||||||
|
$api_key_secret = trim((string)$api_key_secret);
|
||||||
|
if ($api_key_id === '' || $api_key_secret === '')
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Piwigo-API-Schluessel-ID und API-Geheimnis werden benoetigt.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$status = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'pwg.session.getStatus');
|
||||||
|
if (!is_array($status)) throw new RuntimeException('Piwigo hat keinen auswertbaren API-Benutzerstatus geliefert.');
|
||||||
|
$role = strtolower(trim((string)($status['status'] ?? '')));
|
||||||
|
if (!in_array($role, array('admin','webmaster'), true))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Der API-Key funktioniert, gehoert aber keinem Piwigo-Administrator/Webmaster.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$method_result = bratonien_tools_nc_connector_piwigo_api_request($api_key_id, $api_key_secret, 'reflection.getMethodList');
|
||||||
|
$method_map = array();
|
||||||
|
bratonien_tools_nc_connector_collect_method_names($method_result, $method_map);
|
||||||
|
$required = array('bratonien.nc.syncProductive', 'bratonien.nc.syncOrphans');
|
||||||
|
$missing = array_values(array_diff($required, array_keys($method_map)));
|
||||||
|
if ($missing)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Der API-Key ist gueltig, aber benoetigte Bratonien-Sync-Methoden fehlen: '.implode(', ', $missing).'.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection(array $connection, $mode)
|
||||||
|
{
|
||||||
|
$id = (int)$connection['id'];
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
|
||||||
|
$base_url = trim((string)($config['nextcloud_url'] ?? ''));
|
||||||
|
$username = trim((string)($credentials['nextcloud_user'] ?? ''));
|
||||||
|
if ($username === '')
|
||||||
|
{
|
||||||
|
$username = trim((string)($config['nextcloud_access_user'] ?? $config['access_user'] ?? ''));
|
||||||
|
}
|
||||||
|
$password = (string)($credentials['nextcloud_password'] ?? '');
|
||||||
|
|
||||||
|
$roots = isset($config['roots']) && is_array($config['roots']) ? array_values($config['roots']) : array();
|
||||||
|
$selected = array();
|
||||||
|
$selected_ids = array();
|
||||||
|
foreach ($roots as $root)
|
||||||
|
{
|
||||||
|
$path = trim((string)($root['webdav_path'] ?? ''), '/');
|
||||||
|
$fileid = (int)($root['fileid'] ?? 0);
|
||||||
|
if ($fileid < 1) continue;
|
||||||
|
$selected[] = $path;
|
||||||
|
$selected_ids[$path] = $fileid;
|
||||||
|
}
|
||||||
|
|
||||||
|
$state = bratonien_tools_nc_wizard_state();
|
||||||
|
$state = array_merge($state, array(
|
||||||
|
'editing_connection_id'=>$id,
|
||||||
|
'editing_adapter'=>(string)$connection['adapter'],
|
||||||
|
'editing_mode'=>(string)$mode,
|
||||||
|
'connection_name'=>(string)$connection['name'],
|
||||||
|
'host_input'=>$base_url,
|
||||||
|
'base_url'=>$base_url,
|
||||||
|
'username'=>$username,
|
||||||
|
'_password'=>$password,
|
||||||
|
'_fallback_user'=>(string)($credentials['piwigo_user'] ?? ''),
|
||||||
|
'_fallback_password'=>(string)($credentials['piwigo_password'] ?? ''),
|
||||||
|
'_api_key_id'=>(string)($credentials['api_key_id'] ?? ''),
|
||||||
|
'_api_key_secret'=>(string)($credentials['api_key_secret'] ?? ''),
|
||||||
|
'api_status'=>trim((string)($credentials['api_key_id'] ?? '')) !== '' && trim((string)($credentials['api_key_secret'] ?? '')) !== '' ? 'ok' : 'pending',
|
||||||
|
'roots'=>$roots,
|
||||||
|
'directory_selected'=>$selected,
|
||||||
|
'directory_selected_fileids'=>$selected_ids,
|
||||||
|
'source_mode'=>'webdav-placeholder',
|
||||||
|
'transport'=>'webdav',
|
||||||
|
));
|
||||||
|
|
||||||
|
if ($base_url !== '' && $username !== '' && $password !== '')
|
||||||
|
{
|
||||||
|
$state['step'] = 2;
|
||||||
|
$state['scan_ok'] = true;
|
||||||
|
$state['technical_stage'] = 'mounts';
|
||||||
|
$state['technical_source'] = 'WebDAV';
|
||||||
|
$state['technical_error'] = '';
|
||||||
|
$state['technical_complete'] = false;
|
||||||
|
$state['directory_selection_ready'] = true;
|
||||||
|
$state['directory_path'] = '';
|
||||||
|
$state['directory_parent'] = '';
|
||||||
|
$state['directory_children'] = array();
|
||||||
|
$state['directory_current_fileid'] = 0;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_wizard_refresh_directory_state($state, '');
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
$state['step'] = 1;
|
||||||
|
$state['scan_ok'] = false;
|
||||||
|
$state['technical_error'] = $e->getMessage();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$state['step'] = 1;
|
||||||
|
$state['scan_ok'] = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_wizard_store($state);
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_edit_start()
|
||||||
|
{
|
||||||
|
$id = (int)($_POST['connection_id'] ?? 0);
|
||||||
|
$connection = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
|
||||||
|
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$is_webdav = (string)$connection['adapter'] === 'remote'
|
||||||
|
&& (string)($config['source_mode'] ?? '') === 'webdav-placeholder';
|
||||||
|
if (!$is_webdav)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Diese Legacy-Verbindung wird direkt bearbeitet. Eine WebDAV-Migration ist eine separate Aktion.');
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'update');
|
||||||
|
return array('message'=>'Verbindung #'.$id.' wurde zum Bearbeiten geoeffnet.');
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_migrate_start()
|
||||||
|
{
|
||||||
|
$id = (int)($_POST['connection_id'] ?? 0);
|
||||||
|
$connection = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
|
||||||
|
if ((string)$connection['adapter'] !== 'local')
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Nur eine Legacy-Verbindung kann auf WebDAV migriert werden.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$migration = bratonien_tools_nc_connector_migration_state($connection);
|
||||||
|
if (empty($migration['ready']))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die WebDAV-Migration ist noch nicht bereit. Unter Bearbeiten fehlen: '.implode(', ', $migration['missing']).'.');
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'migrate');
|
||||||
|
return array('message'=>'Die WebDAV-Migration fuer Verbindung #'.$id.' wurde geoeffnet. Die bestehende Legacy-Verbindung bleibt bis zum erfolgreichen Umstieg unveraendert.');
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_connector_update_local_friendly()
|
||||||
|
{
|
||||||
|
$id = (int)($_POST['connection_id'] ?? 0);
|
||||||
|
$connection = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
if (!$connection) throw new RuntimeException('Connector-Verbindung wurde nicht gefunden.');
|
||||||
|
if ((string)$connection['adapter'] !== 'local') throw new RuntimeException('Diese Bearbeitung ist nur fuer Legacy-Verbindungen vorgesehen.');
|
||||||
|
|
||||||
|
$name = trim((string)($_POST['connection_name'] ?? ''));
|
||||||
|
if ($name === '') throw new RuntimeException('Bitte einen Namen fuer die Verbindung angeben.');
|
||||||
|
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$host = trim((string)($_POST['nc_host'] ?? ''));
|
||||||
|
$port = (int)($_POST['nc_port'] ?? 5432);
|
||||||
|
$database = trim((string)($_POST['nc_database'] ?? ''));
|
||||||
|
$user = trim((string)($_POST['nc_user'] ?? ''));
|
||||||
|
$gallery_root = rtrim(trim((string)($_POST['nc_gallery_root'] ?? '')), '/');
|
||||||
|
$source_view = trim((string)($_POST['nc_source_view'] ?? ''));
|
||||||
|
$activity_view = trim((string)($_POST['nc_activity_view'] ?? ''));
|
||||||
|
|
||||||
|
if ($host === '') throw new RuntimeException('Datenbank-Server fehlt.');
|
||||||
|
if ($port < 1 || $port > 65535) throw new RuntimeException('Der Datenbank-Port ist ungueltig.');
|
||||||
|
if ($database === '') throw new RuntimeException('Datenbankname fehlt.');
|
||||||
|
if ($user === '') throw new RuntimeException('Reader-Benutzer fehlt.');
|
||||||
|
if ($gallery_root === '' || $gallery_root[0] !== '/') throw new RuntimeException('Der Piwigo-Galerieordner muss ein absoluter Pfad sein.');
|
||||||
|
if ($source_view === '' || $activity_view === '') throw new RuntimeException('Die gespeicherten Datenbankansichten duerfen nicht leer sein.');
|
||||||
|
bratonien_tools_nc_connector_view_name($source_view);
|
||||||
|
bratonien_tools_nc_connector_view_name($activity_view);
|
||||||
|
|
||||||
|
$storage_ids = isset($_POST['nc_storage_id']) && is_array($_POST['nc_storage_id']) ? $_POST['nc_storage_id'] : array();
|
||||||
|
$storage_prefixes = isset($_POST['nc_source_prefix']) && is_array($_POST['nc_source_prefix']) ? $_POST['nc_source_prefix'] : array();
|
||||||
|
$storage_mounts = isset($_POST['nc_local_mount']) && is_array($_POST['nc_local_mount']) ? $_POST['nc_local_mount'] : array();
|
||||||
|
$storages = array();
|
||||||
|
$count = max(count($storage_ids), count($storage_prefixes), count($storage_mounts));
|
||||||
|
for ($index = 0; $index < $count; $index++)
|
||||||
|
{
|
||||||
|
$storage_id = trim((string)($storage_ids[$index] ?? ''));
|
||||||
|
$prefix = trim((string)($storage_prefixes[$index] ?? ''), '/');
|
||||||
|
$mount = rtrim(trim((string)($storage_mounts[$index] ?? '')), '/');
|
||||||
|
if ($storage_id === '' && $prefix === '' && $mount === '') continue;
|
||||||
|
if ($storage_id === '') throw new RuntimeException('Bei einem Speicherort fehlt die Storage-ID.');
|
||||||
|
if ($mount === '' || $mount[0] !== '/') throw new RuntimeException('Bei einem Speicherort fehlt ein gueltiger lokaler Pfad.');
|
||||||
|
$storages[] = array('storage_id'=>$storage_id, 'source_prefix'=>$prefix, 'local_mount'=>$mount);
|
||||||
|
}
|
||||||
|
if (!$storages) throw new RuntimeException('Mindestens ein Speicherort muss vorhanden sein.');
|
||||||
|
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
$new_db_password = (string)($_POST['nc_db_password'] ?? '');
|
||||||
|
if ($new_db_password !== '') $credentials['db_password'] = $new_db_password;
|
||||||
|
if (trim((string)($credentials['db_password'] ?? '')) === '') throw new RuntimeException('Fuer die Legacy-Verbindung ist kein Datenbankpasswort gespeichert.');
|
||||||
|
|
||||||
|
$nextcloud_url = trim((string)($_POST['nc_nextcloud_url'] ?? ($config['nextcloud_url'] ?? '')));
|
||||||
|
$nextcloud_user = trim((string)($_POST['nc_nextcloud_user'] ?? ($credentials['nextcloud_user'] ?? '')));
|
||||||
|
$new_nextcloud_password = (string)($_POST['nc_nextcloud_password'] ?? '');
|
||||||
|
if ($new_nextcloud_password !== '') $credentials['nextcloud_password'] = $new_nextcloud_password;
|
||||||
|
$nextcloud_password = (string)($credentials['nextcloud_password'] ?? '');
|
||||||
|
|
||||||
|
$api_key_id = trim((string)($_POST['nc_connection_api_key_id'] ?? ($credentials['api_key_id'] ?? '')));
|
||||||
|
$new_api_secret = trim((string)($_POST['nc_connection_api_key_secret'] ?? ''));
|
||||||
|
$old_api_id = trim((string)($credentials['api_key_id'] ?? ''));
|
||||||
|
if ($api_key_id !== $old_api_id && $new_api_secret === '')
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Wenn die API-Schluessel-ID geaendert wird, muss auch das API-Geheimnis neu eingegeben werden.');
|
||||||
|
}
|
||||||
|
if ($new_api_secret !== '') $credentials['api_key_secret'] = $new_api_secret;
|
||||||
|
$api_key_secret = trim((string)($credentials['api_key_secret'] ?? ''));
|
||||||
|
|
||||||
|
if (($nextcloud_url === '' || $nextcloud_user === '' || $nextcloud_password === '') && ($nextcloud_url !== '' || $nextcloud_user !== '' || $nextcloud_password !== ''))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Nextcloud-Adresse, Nextcloud-Benutzer und Nextcloud-Passwort muessen fuer WebDAV gemeinsam vollstaendig sein.');
|
||||||
|
}
|
||||||
|
if (($api_key_id === '') !== ($api_key_secret === ''))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Piwigo-API-Schluessel-ID und API-Geheimnis muessen gemeinsam vollstaendig sein.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($nextcloud_url !== '')
|
||||||
|
{
|
||||||
|
$validated_nc = bratonien_tools_nc_connector_validate_nextcloud_access($nextcloud_url, $nextcloud_user, $nextcloud_password);
|
||||||
|
$nextcloud_url = $validated_nc['base_url'];
|
||||||
|
$nextcloud_user = $validated_nc['username'];
|
||||||
|
$credentials['nextcloud_user'] = $nextcloud_user;
|
||||||
|
}
|
||||||
|
if ($api_key_id !== '')
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret);
|
||||||
|
$credentials['api_key_id'] = $api_key_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$config['host'] = $host;
|
||||||
|
$config['port'] = (string)$port;
|
||||||
|
$config['database'] = $database;
|
||||||
|
$config['user'] = $user;
|
||||||
|
$config['source_view'] = $source_view;
|
||||||
|
$config['activity_view'] = $activity_view;
|
||||||
|
$config['gallery_root'] = $gallery_root;
|
||||||
|
$config['quiet_seconds'] = max(0, (int)($_POST['nc_quiet_seconds'] ?? ($config['quiet_seconds'] ?? 120)));
|
||||||
|
$config['max_wait_seconds'] = max(60, (int)($_POST['nc_max_wait_seconds'] ?? ($config['max_wait_seconds'] ?? 900)));
|
||||||
|
$config['full_sync_seconds'] = max(300, (int)($_POST['nc_full_sync_seconds'] ?? ($config['full_sync_seconds'] ?? 86400)));
|
||||||
|
$config['storages'] = $storages;
|
||||||
|
if ($nextcloud_url !== '')
|
||||||
|
{
|
||||||
|
$config['nextcloud_url'] = $nextcloud_url;
|
||||||
|
$config['access_user'] = $nextcloud_user;
|
||||||
|
$config['nextcloud_access_user'] = $nextcloud_user;
|
||||||
|
}
|
||||||
|
$config['piwigo_auth'] = 'connection-scoped';
|
||||||
|
$config['api_enabled'] = $api_key_id !== '' && $api_key_secret !== '';
|
||||||
|
unset($config['verification']);
|
||||||
|
|
||||||
|
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
if (!is_string($config_json)) throw new RuntimeException('Connector-Konfiguration konnte nicht serialisiert werden.');
|
||||||
|
$secret_payload = json_encode($credentials, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
if (!is_string($secret_payload)) throw new RuntimeException('Connector-Zugangsdaten konnten nicht serialisiert werden.');
|
||||||
|
$secret_blob = bratonien_tools_nc_connector_encrypt_secret($secret_payload);
|
||||||
|
|
||||||
|
$table = bratonien_tools_nc_connector_table();
|
||||||
|
$now = date('Y-m-d H:i:s');
|
||||||
|
pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$id." LIMIT 1");
|
||||||
|
|
||||||
|
$updated = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
$migration = $updated ? bratonien_tools_nc_connector_migration_state($updated) : array('ready'=>false);
|
||||||
|
return array(
|
||||||
|
'message'=>'Verbindung #'.$id.' wurde gespeichert. '.(!empty($migration['ready']) ? 'Die WebDAV-Migration ist jetzt bereit.' : 'Die WebDAV-Migration ist noch nicht vollstaendig vorbereitet.'),
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -5,10 +5,57 @@ if (!defined('PHPWG_ROOT_PATH'))
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a disabled WebDAV-backed connector beside the existing local modes.
|
* Link a WebDAV successor with the exact legacy connection selected for migration.
|
||||||
|
* The caller must execute this inside the same transaction that creates the successor.
|
||||||
|
*/
|
||||||
|
function bratonien_tools_nc_connector_pair_migration_fallback($legacy_id, $webdav_id, array &$webdav_config, $now)
|
||||||
|
{
|
||||||
|
$legacy_id = (int)$legacy_id;
|
||||||
|
$webdav_id = (int)$webdav_id;
|
||||||
|
if ($legacy_id < 1 || $webdav_id < 1 || $legacy_id === $webdav_id)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die Migrationszuordnung ist ungueltig.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$legacy = bratonien_tools_nc_connector_connection($legacy_id, false);
|
||||||
|
if (!$legacy || (string)$legacy['adapter'] !== 'local')
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die ausgewaehlte Legacy-Verbindung fuer die Migration ist nicht mehr verfuegbar.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$legacy_config = isset($legacy['config']) && is_array($legacy['config']) ? $legacy['config'] : array();
|
||||||
|
$webdav_config['migration'] = array(
|
||||||
|
'role'=>'webdav-primary-candidate',
|
||||||
|
'legacy_fallback_connection_id'=>$legacy_id,
|
||||||
|
'fallback_policy'=>'keep-running',
|
||||||
|
'paired_at'=>(string)$now,
|
||||||
|
'cutover_state'=>'parallel',
|
||||||
|
);
|
||||||
|
$legacy_config['migration'] = array(
|
||||||
|
'role'=>'legacy-fallback',
|
||||||
|
'webdav_successor_connection_id'=>$webdav_id,
|
||||||
|
'fallback_policy'=>'keep-running',
|
||||||
|
'paired_at'=>(string)$now,
|
||||||
|
'cutover_state'=>'parallel',
|
||||||
|
);
|
||||||
|
|
||||||
|
$legacy_json = json_encode($legacy_config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
if (!is_string($legacy_json))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die bestehende Verbindung konnte nicht als Migrations-Fallback markiert werden.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$table = bratonien_tools_nc_connector_table();
|
||||||
|
pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($legacy_json)."', updated='".pwg_db_real_escape_string((string)$now)."' WHERE id=".$legacy_id." AND adapter='local' LIMIT 1");
|
||||||
|
|
||||||
|
return $legacy_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create or update a WebDAV-backed connector from the user-facing wizard.
|
||||||
*
|
*
|
||||||
* This deliberately does not activate, migrate or modify any existing
|
* Remote connections are updated in place. A legacy connection is paired only
|
||||||
* connection. It only persists the data required for the parallel WebDAV path.
|
* when the wizard was explicitly opened in migration mode for that connection.
|
||||||
*/
|
*/
|
||||||
function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
||||||
{
|
{
|
||||||
@@ -16,7 +63,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
|||||||
|
|
||||||
if (empty($state['scan_ok']) || empty($state['technical_complete']))
|
if (empty($state['scan_ok']) || empty($state['technical_complete']))
|
||||||
{
|
{
|
||||||
throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollständig vorbereitet.');
|
throw new RuntimeException('Die WebDAV-Verbindung wurde im Assistenten noch nicht vollstaendig vorbereitet.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$base_url = rtrim(trim((string)($state['base_url'] ?? '')), '/');
|
$base_url = rtrim(trim((string)($state['base_url'] ?? '')), '/');
|
||||||
@@ -24,7 +71,7 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
|||||||
$password = (string)($state['_password'] ?? '');
|
$password = (string)($state['_password'] ?? '');
|
||||||
if ($base_url === '' || $username === '' || $password === '')
|
if ($base_url === '' || $username === '' || $password === '')
|
||||||
{
|
{
|
||||||
throw new RuntimeException('Für den WebDAV-Testpfad fehlen Nextcloud-Adresse oder Zugangsdaten.');
|
throw new RuntimeException('Fuer den WebDAV-Zugang fehlen Nextcloud-Adresse oder Zugangsdaten.');
|
||||||
}
|
}
|
||||||
|
|
||||||
$selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
|
$selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
|
||||||
@@ -33,17 +80,19 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
|||||||
$selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
|
$selected_ids = isset($state['directory_selected_fileids']) && is_array($state['directory_selected_fileids'])
|
||||||
? $state['directory_selected_fileids']
|
? $state['directory_selected_fileids']
|
||||||
: array();
|
: array();
|
||||||
$selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
|
if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswaehlen.');
|
||||||
if (!$selected) throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis für den WebDAV-Testpfad auswählen.');
|
|
||||||
|
|
||||||
$roots = array();
|
$roots = array();
|
||||||
foreach ($selected as $path)
|
foreach ($selected as $path)
|
||||||
{
|
{
|
||||||
$fileid = isset($selected_ids[$path]) ? (int)$selected_ids[$path] : 0;
|
$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.');
|
if ($fileid < 1) throw new RuntimeException('Fuer ein ausgewaehltes 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(
|
$roots[] = array(
|
||||||
'fileid'=>$fileid,
|
'fileid'=>$fileid,
|
||||||
'display_name'=>basename($path),
|
'display_name'=>$display_name,
|
||||||
'webdav_path'=>$path,
|
'webdav_path'=>$path,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -59,6 +108,22 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
|||||||
$fallback_password = (string)($state['_fallback_password'] ?? '');
|
$fallback_password = (string)($state['_fallback_password'] ?? '');
|
||||||
$api_enabled = $api_key_id !== '' && $api_key_secret !== '';
|
$api_enabled = $api_key_id !== '' && $api_key_secret !== '';
|
||||||
|
|
||||||
|
$editing_id = (int)($state['editing_connection_id'] ?? 0);
|
||||||
|
$editing_mode = (string)($state['editing_mode'] ?? '');
|
||||||
|
$editing_connection = $editing_id > 0 ? bratonien_tools_nc_connector_connection($editing_id, false) : null;
|
||||||
|
$editing_remote = $editing_connection
|
||||||
|
&& (string)$editing_connection['adapter'] === 'remote'
|
||||||
|
&& (string)($editing_connection['config']['source_mode'] ?? '') === 'webdav-placeholder'
|
||||||
|
&& $editing_mode === 'update';
|
||||||
|
$migrating_legacy = $editing_connection
|
||||||
|
&& (string)$editing_connection['adapter'] === 'local'
|
||||||
|
&& $editing_mode === 'migrate';
|
||||||
|
|
||||||
|
if ($editing_mode === 'migrate' && !$migrating_legacy)
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die fuer die Migration ausgewaehlte Legacy-Verbindung ist nicht mehr verfuegbar.');
|
||||||
|
}
|
||||||
|
|
||||||
$config = array(
|
$config = array(
|
||||||
'origin'=>'native',
|
'origin'=>'native',
|
||||||
'source_mode'=>'webdav-placeholder',
|
'source_mode'=>'webdav-placeholder',
|
||||||
@@ -78,6 +143,19 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
|||||||
'api_enabled'=>$api_enabled,
|
'api_enabled'=>$api_enabled,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if ($editing_remote)
|
||||||
|
{
|
||||||
|
$old_config = is_array($editing_connection['config'] ?? null) ? $editing_connection['config'] : array();
|
||||||
|
foreach (array('state_dir','status_file','parallel_gallery_root','source_fingerprint','runtime','migration') as $preserve)
|
||||||
|
{
|
||||||
|
if (array_key_exists($preserve, $old_config)) $config[$preserve] = $old_config[$preserve];
|
||||||
|
}
|
||||||
|
foreach (array('quiet_seconds','max_wait_seconds','full_sync_seconds') as $preserve)
|
||||||
|
{
|
||||||
|
if (isset($old_config[$preserve])) $config[$preserve] = (int)$old_config[$preserve];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach (array('product'=>'nextcloud_product', 'version'=>'nextcloud_version') as $state_key=>$config_key)
|
foreach (array('product'=>'nextcloud_product', 'version'=>'nextcloud_version') as $state_key=>$config_key)
|
||||||
{
|
{
|
||||||
$value = trim((string)($state[$state_key] ?? ''));
|
$value = trim((string)($state[$state_key] ?? ''));
|
||||||
@@ -96,38 +174,82 @@ function bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard()
|
|||||||
), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
if (!is_string($secret_payload)) throw new RuntimeException('WebDAV-Zugangsdaten konnten nicht serialisiert werden.');
|
if (!is_string($secret_payload)) throw new RuntimeException('WebDAV-Zugangsdaten konnten nicht serialisiert werden.');
|
||||||
|
|
||||||
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
|
||||||
if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');
|
|
||||||
|
|
||||||
bratonien_tools_nc_connector_ensure_table();
|
bratonien_tools_nc_connector_ensure_table();
|
||||||
$table = bratonien_tools_nc_connector_table();
|
$table = bratonien_tools_nc_connector_table();
|
||||||
$now = date('Y-m-d H:i:s');
|
$now = date('Y-m-d H:i:s');
|
||||||
$connection_key = 'webdav-'.bin2hex(random_bytes(12));
|
|
||||||
$secret_blob = bratonien_tools_nc_connector_encrypt_secret($secret_payload);
|
$secret_blob = bratonien_tools_nc_connector_encrypt_secret($secret_payload);
|
||||||
|
|
||||||
pwg_query("INSERT INTO `$table` (connection_key,name,adapter,enabled,takeover_state,config_json,secret_blob,created,updated) VALUES ('"
|
if ($editing_remote)
|
||||||
.pwg_db_real_escape_string($connection_key)."','"
|
|
||||||
.pwg_db_real_escape_string($name)."','remote',0,'disabled','"
|
|
||||||
.pwg_db_real_escape_string($config_json)."','"
|
|
||||||
.pwg_db_real_escape_string($secret_blob)."','"
|
|
||||||
.pwg_db_real_escape_string($now)."','"
|
|
||||||
.pwg_db_real_escape_string($now)."')");
|
|
||||||
|
|
||||||
$id = (int)pwg_db_insert_id();
|
|
||||||
if ($id < 1) throw new RuntimeException('Die WebDAV-Testverbindung konnte nicht eindeutig angelegt werden.');
|
|
||||||
|
|
||||||
$config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
|
|
||||||
$config['status_file'] = $config['state_dir'].'/connector-status.json';
|
|
||||||
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
|
||||||
if (!is_string($config_json))
|
|
||||||
{
|
{
|
||||||
pwg_query("DELETE FROM `$table` WHERE id=".$id." LIMIT 1");
|
$config['state_dir'] = trim((string)($config['state_dir'] ?? '')) !== '' ? $config['state_dir'] : '/var/lib/bratonien-tools/nc-connector/connection-'.$editing_id;
|
||||||
throw new RuntimeException('Die WebDAV-Testverbindung konnte nach dem Anlegen nicht serialisiert werden.');
|
$config['status_file'] = trim((string)($config['status_file'] ?? '')) !== '' ? $config['status_file'] : $config['state_dir'].'/connector-status.json';
|
||||||
|
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');
|
||||||
|
|
||||||
|
pwg_query("UPDATE `$table` SET name='".pwg_db_real_escape_string($name)."', config_json='".pwg_db_real_escape_string($config_json)."', secret_blob='".pwg_db_real_escape_string($secret_blob)."', updated='".pwg_db_real_escape_string($now)."' WHERE id=".$editing_id." AND adapter='remote' LIMIT 1");
|
||||||
|
unset($_SESSION['bratonien_nc_wizard']);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'connection_id'=>$editing_id,
|
||||||
|
'message'=>'WebDAV-Verbindung #'.$editing_id.' wurde gespeichert. Der naechste Connector-Lauf verwendet die neuen Einstellungen.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
if (!is_string($config_json)) throw new RuntimeException('WebDAV-Konfiguration konnte nicht serialisiert werden.');
|
||||||
|
|
||||||
|
$connection_key = 'webdav-'.bin2hex(random_bytes(12));
|
||||||
|
$legacy_fallback_id = null;
|
||||||
|
$id = 0;
|
||||||
|
|
||||||
|
pwg_query('START TRANSACTION');
|
||||||
|
try
|
||||||
|
{
|
||||||
|
pwg_query("INSERT INTO `$table` (connection_key,name,adapter,enabled,takeover_state,config_json,secret_blob,created,updated) VALUES ('"
|
||||||
|
.pwg_db_real_escape_string($connection_key)."','"
|
||||||
|
.pwg_db_real_escape_string($name)."','remote',0,'disabled','"
|
||||||
|
.pwg_db_real_escape_string($config_json)."','"
|
||||||
|
.pwg_db_real_escape_string($secret_blob)."','"
|
||||||
|
.pwg_db_real_escape_string($now)."','"
|
||||||
|
.pwg_db_real_escape_string($now)."')");
|
||||||
|
|
||||||
|
$id = (int)pwg_db_insert_id();
|
||||||
|
if ($id < 1) throw new RuntimeException('Die WebDAV-Verbindung konnte nicht eindeutig angelegt werden.');
|
||||||
|
|
||||||
|
$config['state_dir'] = '/var/lib/bratonien-tools/nc-connector/connection-'.$id;
|
||||||
|
$config['status_file'] = $config['state_dir'].'/connector-status.json';
|
||||||
|
if ($migrating_legacy)
|
||||||
|
{
|
||||||
|
$legacy_fallback_id = bratonien_tools_nc_connector_pair_migration_fallback($editing_id, $id, $config, $now);
|
||||||
|
}
|
||||||
|
|
||||||
|
$config_json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
if (!is_string($config_json))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die WebDAV-Verbindung konnte nach dem Anlegen nicht serialisiert werden.');
|
||||||
|
}
|
||||||
|
pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." AND adapter='remote' LIMIT 1");
|
||||||
|
pwg_query('COMMIT');
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
pwg_query('ROLLBACK');
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
|
||||||
|
unset($_SESSION['bratonien_nc_wizard']);
|
||||||
|
|
||||||
|
if ($legacy_fallback_id !== null)
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
'connection_id'=>$id,
|
||||||
|
'legacy_fallback_connection_id'=>$legacy_fallback_id,
|
||||||
|
'message'=>'WebDAV-Nachfolger wurde angelegt. Die bestehende lokale Verbindung #'.$legacy_fallback_id.' bleibt als Fallback erhalten.',
|
||||||
|
);
|
||||||
}
|
}
|
||||||
pwg_query("UPDATE `$table` SET config_json='".pwg_db_real_escape_string($config_json)."' WHERE id=".$id." LIMIT 1");
|
|
||||||
|
|
||||||
return array(
|
return array(
|
||||||
'connection_id'=>$id,
|
'connection_id'=>$id,
|
||||||
'message'=>'Parallele WebDAV-Testverbindung wurde deaktiviert angelegt. Bestehende Verbindungen blieben unverändert.',
|
'message'=>'WebDAV-Verbindung wurde angelegt.',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,7 +126,6 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
|
|||||||
$selected = isset($state['directory_selected']) && is_array($state['directory_selected'])
|
$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_values(array_unique(array_map(function($path) { return trim((string)$path, '/'); }, $state['directory_selected'])))
|
||||||
: array();
|
: array();
|
||||||
$selected = array_values(array_filter($selected, function($path) { return $path !== ''; }));
|
|
||||||
if (!$selected)
|
if (!$selected)
|
||||||
{
|
{
|
||||||
throw new RuntimeException('Bitte mindestens ein Nextcloud-Verzeichnis auswählen.');
|
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.');
|
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(
|
$roots[] = array(
|
||||||
'fileid'=>$fileid,
|
'fileid'=>$fileid,
|
||||||
'display_name'=>basename($path),
|
'display_name'=>$display_name,
|
||||||
'webdav_path'=>$path,
|
'webdav_path'=>$path,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -156,9 +158,35 @@ function bratonien_tools_nc_wizard_save_sources_dispatch()
|
|||||||
$state['technical_source'] = 'WebDAV-Verzeichnisse ausgewählt';
|
$state['technical_source'] = 'WebDAV-Verzeichnisse ausgewählt';
|
||||||
$state['technical_error'] = '';
|
$state['technical_error'] = '';
|
||||||
$state['directory_selection_ready'] = false;
|
$state['directory_selection_ready'] = false;
|
||||||
bratonien_tools_nc_wizard_store($state);
|
|
||||||
|
|
||||||
return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den parallelen Testweg vorbereitet.');
|
if ((string)($state['editing_mode'] ?? '') === 'migrate')
|
||||||
|
{
|
||||||
|
$editing_id = (int)($state['editing_connection_id'] ?? 0);
|
||||||
|
$connection = $editing_id > 0 ? bratonien_tools_nc_connector_connection($editing_id, true) : null;
|
||||||
|
if (!$connection || (string)$connection['adapter'] !== 'local')
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die zu migrierende Legacy-Verbindung ist nicht mehr verfügbar.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$migration = bratonien_tools_nc_connector_migration_state($connection);
|
||||||
|
if (empty($migration['ready']))
|
||||||
|
{
|
||||||
|
throw new RuntimeException('Die WebDAV-Migration kann noch nicht abgeschlossen werden. Es fehlen: '.implode(', ', $migration['missing']).'.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
$state['_api_key_id'] = (string)($credentials['api_key_id'] ?? '');
|
||||||
|
$state['_api_key_secret'] = (string)($credentials['api_key_secret'] ?? '');
|
||||||
|
$state['api_status'] = !empty($migration['api_available']) ? 'ok' : 'skipped';
|
||||||
|
$state['api_error'] = '';
|
||||||
|
$state['step'] = 4;
|
||||||
|
bratonien_tools_nc_wizard_store($state);
|
||||||
|
|
||||||
|
return array('message'=>'WebDAV-Quelle wurde übernommen. Mit „Migration starten“ wird jetzt der WebDAV-Nachfolger angelegt; die Legacy-Verbindung bleibt als Fallback erhalten.');
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_wizard_store($state);
|
||||||
|
return array('message'=>'WebDAV-Verzeichnisse wurden übernommen. Die Verbindung ist für den nächsten Einrichtungsschritt vorbereitet.');
|
||||||
}
|
}
|
||||||
|
|
||||||
function bratonien_tools_nc_wizard_finish_dispatch()
|
function bratonien_tools_nc_wizard_finish_dispatch()
|
||||||
|
|||||||
@@ -4,6 +4,23 @@ if (!defined('PHPWG_ROOT_PATH'))
|
|||||||
die('Hacking attempt!');
|
die('Hacking attempt!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($GLOBALS['template']) && is_object($GLOBALS['template']) && method_exists($GLOBALS['template'], 'func_combine_script'))
|
||||||
|
{
|
||||||
|
$script_version = function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : '0.9.6.15';
|
||||||
|
$GLOBALS['template']->func_combine_script(array(
|
||||||
|
'id'=>'bratonien_nc_connector_edit_v2',
|
||||||
|
'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_edit_v2.js',
|
||||||
|
'load'=>'footer',
|
||||||
|
'version'=>$script_version,
|
||||||
|
));
|
||||||
|
$GLOBALS['template']->func_combine_script(array(
|
||||||
|
'id'=>'bratonien_nc_connector_source_ui',
|
||||||
|
'path'=>BRATONIEN_TOOLS_PATH.'js/nc_connector_source_ui.js',
|
||||||
|
'load'=>'footer',
|
||||||
|
'version'=>$script_version,
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
require_once(BRATONIEN_TOOLS_PATH . 'tools/image_cache.inc.php');
|
require_once(BRATONIEN_TOOLS_PATH . 'tools/image_cache.inc.php');
|
||||||
require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark.inc.php');
|
require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark.inc.php');
|
||||||
require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark_profiles.inc.php');
|
require_once(BRATONIEN_TOOLS_PATH . 'tools/watermark_profiles.inc.php');
|
||||||
@@ -30,6 +47,7 @@ require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_generic_scope.inc.php'
|
|||||||
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_delete_safe.inc.php');
|
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_delete_safe.inc.php');
|
||||||
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_webdav.inc.php');
|
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_webdav.inc.php');
|
||||||
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_webdav_flow.inc.php');
|
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_wizard_webdav_flow.inc.php');
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH . 'include/nc_connector_edit.inc.php');
|
||||||
|
|
||||||
function bratonien_tools_get_tools()
|
function bratonien_tools_get_tools()
|
||||||
{
|
{
|
||||||
@@ -56,6 +74,9 @@ function bratonien_tools_get_tools()
|
|||||||
'album_share_revoke' => array('handler' => 'bratonien_tools_revoke_album_share'),
|
'album_share_revoke' => array('handler' => 'bratonien_tools_revoke_album_share'),
|
||||||
'nc_connector_create_local' => array('handler' => 'bratonien_tools_nc_connector_create_local_api_first'),
|
'nc_connector_create_local' => array('handler' => 'bratonien_tools_nc_connector_create_local_api_first'),
|
||||||
'nc_connector_create_webdav_parallel' => array('handler' => 'bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard'),
|
'nc_connector_create_webdav_parallel' => array('handler' => 'bratonien_tools_nc_connector_create_webdav_placeholder_from_wizard'),
|
||||||
|
'nc_connector_edit_start' => array('handler' => 'bratonien_tools_nc_connector_edit_start'),
|
||||||
|
'nc_connector_migrate_start' => array('handler' => 'bratonien_tools_nc_connector_migrate_start'),
|
||||||
|
'nc_connector_update_local' => array('handler' => 'bratonien_tools_nc_connector_update_local_friendly'),
|
||||||
'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_safe'),
|
'nc_connector_delete' => array('handler' => 'bratonien_tools_nc_connector_delete_safe'),
|
||||||
'nc_connector_update_name' => array('handler' => 'bratonien_tools_nc_connector_update_name'),
|
'nc_connector_update_name' => array('handler' => 'bratonien_tools_nc_connector_update_name'),
|
||||||
'nc_connector_update_technical' => array('handler' => 'bratonien_tools_nc_connector_update_technical'),
|
'nc_connector_update_technical' => array('handler' => 'bratonien_tools_nc_connector_update_technical'),
|
||||||
|
|||||||
@@ -1,6 +1,94 @@
|
|||||||
(function () {
|
(function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
function initNcRouteStatus() {
|
||||||
|
var section = document.getElementById('nc-connector');
|
||||||
|
if (!section) return;
|
||||||
|
|
||||||
|
var statusCard = section.querySelector('.bratonien-grid .bratonien-card');
|
||||||
|
if (!statusCard) return;
|
||||||
|
|
||||||
|
var grid = statusCard.querySelector('.bratonien-form-grid');
|
||||||
|
if (!grid) return;
|
||||||
|
|
||||||
|
var routeLabel = document.createElement('span');
|
||||||
|
routeLabel.className = 'bratonien-label';
|
||||||
|
routeLabel.textContent = 'Aktiver Datenweg';
|
||||||
|
|
||||||
|
var routeValue = document.createElement('strong');
|
||||||
|
routeValue.setAttribute('data-nc-route-status', '');
|
||||||
|
routeValue.textContent = 'Noch kein Lauf erfasst';
|
||||||
|
|
||||||
|
var routeTimeLabel = document.createElement('span');
|
||||||
|
routeTimeLabel.className = 'bratonien-label';
|
||||||
|
routeTimeLabel.textContent = 'Datenweg zuletzt';
|
||||||
|
|
||||||
|
var routeTimeValue = document.createElement('strong');
|
||||||
|
routeTimeValue.setAttribute('data-nc-route-time', '');
|
||||||
|
routeTimeValue.textContent = 'Nicht verfügbar';
|
||||||
|
|
||||||
|
grid.appendChild(routeLabel);
|
||||||
|
grid.appendChild(routeValue);
|
||||||
|
grid.appendChild(routeTimeLabel);
|
||||||
|
grid.appendChild(routeTimeValue);
|
||||||
|
|
||||||
|
var detail = document.createElement('p');
|
||||||
|
detail.className = 'bratonien-base-note';
|
||||||
|
detail.setAttribute('data-nc-route-detail', '');
|
||||||
|
detail.textContent = 'Der Datenweg wird nach dem nächsten Connector-Lauf angezeigt.';
|
||||||
|
statusCard.appendChild(detail);
|
||||||
|
|
||||||
|
var basePath = window.location.pathname.replace(/admin\.php.*$/, '');
|
||||||
|
var statusUrl = basePath + '_data/bratonien-tools/nc-connector-status/route-status.json';
|
||||||
|
|
||||||
|
function formatTime(timestamp) {
|
||||||
|
if (!timestamp) return 'Nicht verfügbar';
|
||||||
|
var date = new Date(Number(timestamp) * 1000);
|
||||||
|
if (Number.isNaN(date.getTime())) return 'Nicht verfügbar';
|
||||||
|
return date.toLocaleString('de-DE');
|
||||||
|
}
|
||||||
|
|
||||||
|
function render(data) {
|
||||||
|
var label = data && data.label ? String(data.label) : 'Unbekannt';
|
||||||
|
var route = data && data.route ? String(data.route) : '';
|
||||||
|
routeValue.textContent = label;
|
||||||
|
routeTimeValue.textContent = formatTime(data && data.timestamp);
|
||||||
|
|
||||||
|
if (route === 'webdav') {
|
||||||
|
routeValue.textContent = 'WEBDAV PRIMÄR';
|
||||||
|
detail.textContent = 'Portierung läuft über WebDAV. Legacy wurde in diesem Lauf nicht benutzt.';
|
||||||
|
} else if (route === 'legacy_fallback') {
|
||||||
|
routeValue.textContent = 'LEGACY-FALLBACK AKTIV';
|
||||||
|
detail.textContent = 'WebDAV war nicht erfolgreich. Dieser Lauf wurde über die alte Struktur abgefangen.';
|
||||||
|
} else if (route === 'failed') {
|
||||||
|
routeValue.textContent = 'FEHLER - KEIN ERFOLGREICHER DATENWEG';
|
||||||
|
detail.textContent = data && data.detail ? String(data.detail) : 'WebDAV und Fallback sind fehlgeschlagen.';
|
||||||
|
} else {
|
||||||
|
detail.textContent = data && data.detail ? String(data.detail) : 'Unbekannter Datenweg.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function refresh() {
|
||||||
|
fetch(statusUrl + '?t=' + Date.now(), {
|
||||||
|
cache: 'no-store',
|
||||||
|
credentials: 'same-origin'
|
||||||
|
})
|
||||||
|
.then(function (response) {
|
||||||
|
if (!response.ok) throw new Error('status unavailable');
|
||||||
|
return response.json();
|
||||||
|
})
|
||||||
|
.then(render)
|
||||||
|
.catch(function () {
|
||||||
|
routeValue.textContent = 'Noch kein Lauf erfasst';
|
||||||
|
routeTimeValue.textContent = 'Nicht verfügbar';
|
||||||
|
detail.textContent = 'Nach dem nächsten Connector-Lauf wird hier WebDAV oder Legacy-Fallback angezeigt.';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
refresh();
|
||||||
|
window.setInterval(refresh, 10000);
|
||||||
|
}
|
||||||
|
|
||||||
function initBratonienTabs() {
|
function initBratonienTabs() {
|
||||||
var admin = document.querySelector('.bratonien-admin');
|
var admin = document.querySelector('.bratonien-admin');
|
||||||
if (!admin) return;
|
if (!admin) return;
|
||||||
@@ -113,9 +201,14 @@
|
|||||||
activate(initial, false);
|
activate(initial, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (document.readyState === 'loading') {
|
function init() {
|
||||||
document.addEventListener('DOMContentLoaded', initBratonienTabs);
|
|
||||||
} else {
|
|
||||||
initBratonienTabs();
|
initBratonienTabs();
|
||||||
|
initNcRouteStatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', init);
|
||||||
|
} else {
|
||||||
|
init();
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
|||||||
324
js/nc_connector_edit_v2.js
Normal file
324
js/nc_connector_edit_v2.js
Normal file
@@ -0,0 +1,324 @@
|
|||||||
|
(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
function ready(callback) {
|
||||||
|
if (document.readyState === 'loading') {
|
||||||
|
document.addEventListener('DOMContentLoaded', function () { window.setTimeout(callback, 0); });
|
||||||
|
} else {
|
||||||
|
window.setTimeout(callback, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ready(function () {
|
||||||
|
var section = document.getElementById('nc-connector');
|
||||||
|
if (!section) return;
|
||||||
|
|
||||||
|
var pwgTokenInput = section.querySelector('input[name="pwg_token"]');
|
||||||
|
var pwgToken = pwgTokenInput ? pwgTokenInput.value : '';
|
||||||
|
var modeKey = 'bratonienNcWizardMode';
|
||||||
|
|
||||||
|
function escapeHtml(value) {
|
||||||
|
return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
|
||||||
|
return {'&':'&','<':'<','>':'>','"':'"',"'":'''}[c];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function setMode(value) {
|
||||||
|
try { sessionStorage.setItem(modeKey, value); } catch (e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
function postForm(label, tool, id, mode) {
|
||||||
|
var form = document.createElement('form');
|
||||||
|
form.method = 'post';
|
||||||
|
form.style.display = 'inline';
|
||||||
|
form.dataset.ncV2Action = tool;
|
||||||
|
form.innerHTML = '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
|
||||||
|
+ '<input type="hidden" name="connection_id" value="'+escapeHtml(id)+'">'
|
||||||
|
+ '<button class="buttonLike" type="submit" name="bratonien_tool" value="'+escapeHtml(tool)+'">'+escapeHtml(label)+'</button>';
|
||||||
|
if (mode) form.addEventListener('submit', function () { setMode(mode); }, true);
|
||||||
|
return form;
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadConnection(id) {
|
||||||
|
return fetch('plugins/bratonien_tools/nc-connector-edit-data.php?connection_id='+encodeURIComponent(id)+'&_='+Date.now(), {
|
||||||
|
credentials:'same-origin',
|
||||||
|
cache:'no-store',
|
||||||
|
headers:{'Accept':'application/json'}
|
||||||
|
}).then(function (response) {
|
||||||
|
return response.json().then(function (data) {
|
||||||
|
if (!response.ok) throw new Error(data.error || ('HTTP '+response.status));
|
||||||
|
return data;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function dialog() {
|
||||||
|
var node = document.getElementById('bratonien-nc-connection-edit-v2');
|
||||||
|
if (node) return node;
|
||||||
|
node = document.createElement('dialog');
|
||||||
|
node.id = 'bratonien-nc-connection-edit-v2';
|
||||||
|
node.className = 'bratonien-edit-dialog';
|
||||||
|
node.innerHTML = '<div class="bratonien-edit-dialog__body">'
|
||||||
|
+ '<div style="display:flex;align-items:flex-start;justify-content:space-between;gap:1rem">'
|
||||||
|
+ '<div><h4 style="margin:0">Verbindung bearbeiten</h4><p class="bratonien-base-note" style="margin:.35rem 0 0">Alle Daten dieser Verbindung werden hier gepflegt. Eine Migration ist ein eigener Vorgang.</p></div>'
|
||||||
|
+ '<button type="button" class="buttonLike" data-edit-v2-close>Schließen</button></div>'
|
||||||
|
+ '<div data-edit-v2-content style="margin-top:1rem"></div></div>';
|
||||||
|
document.body.appendChild(node);
|
||||||
|
node.querySelector('[data-edit-v2-close]').addEventListener('click', function () { node.close(); });
|
||||||
|
node.addEventListener('click', function (event) { if (event.target === node) node.close(); });
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
|
||||||
|
function storageRow(storage) {
|
||||||
|
storage = storage || {};
|
||||||
|
return '<div class="bratonien-storage-row" data-storage-row>'
|
||||||
|
+ '<label>Storage-ID<input name="nc_storage_id[]" value="'+escapeHtml(storage.storage_id || '')+'" required></label>'
|
||||||
|
+ '<label>Quellordner<input name="nc_source_prefix[]" value="'+escapeHtml(storage.source_prefix || '')+'" placeholder="optional"></label>'
|
||||||
|
+ '<label>Lokaler Speicherpfad<input name="nc_local_mount[]" value="'+escapeHtml(storage.local_mount || '')+'" required></label>'
|
||||||
|
+ '<button type="button" class="buttonLike" data-remove-storage>Entfernen</button></div>';
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearValidation(form) {
|
||||||
|
[].slice.call(form.querySelectorAll('[aria-invalid="true"]')).forEach(function (field) {
|
||||||
|
field.removeAttribute('aria-invalid');
|
||||||
|
field.style.borderColor = '';
|
||||||
|
field.style.boxShadow = '';
|
||||||
|
});
|
||||||
|
[].slice.call(form.querySelectorAll('[data-edit-v2-field-error]')).forEach(function (node) { node.remove(); });
|
||||||
|
var box = form.querySelector('[data-edit-v2-error-summary]');
|
||||||
|
if (box) box.remove();
|
||||||
|
}
|
||||||
|
|
||||||
|
function fieldNodes(form, fieldName) {
|
||||||
|
return [].slice.call(form.querySelectorAll('[name="'+fieldName.replace(/"/g, '\\"')+'"]'));
|
||||||
|
}
|
||||||
|
|
||||||
|
function showValidation(form, data) {
|
||||||
|
clearValidation(form);
|
||||||
|
var message = (data && data.message) ? data.message : 'Die Verbindung konnte nicht gespeichert werden.';
|
||||||
|
var summary = document.createElement('div');
|
||||||
|
summary.dataset.editV2ErrorSummary = '1';
|
||||||
|
summary.className = 'bratonien-main-cache__warning';
|
||||||
|
summary.style.margin = '0 0 1rem';
|
||||||
|
summary.style.padding = '.75rem';
|
||||||
|
summary.style.border = '1px solid currentColor';
|
||||||
|
summary.innerHTML = '<strong>Speichern fehlgeschlagen:</strong> '+escapeHtml(message);
|
||||||
|
form.insertBefore(summary, form.firstChild);
|
||||||
|
|
||||||
|
var first = null;
|
||||||
|
var fields = data && Array.isArray(data.fields) ? data.fields : [];
|
||||||
|
fields.forEach(function (fieldName) {
|
||||||
|
fieldNodes(form, fieldName).forEach(function (field) {
|
||||||
|
field.setAttribute('aria-invalid', 'true');
|
||||||
|
field.style.borderColor = '#d65a5a';
|
||||||
|
field.style.boxShadow = '0 0 0 1px #d65a5a';
|
||||||
|
if (!first) first = field;
|
||||||
|
var note = document.createElement('span');
|
||||||
|
note.dataset.editV2FieldError = '1';
|
||||||
|
note.className = 'bratonien-main-cache__warning';
|
||||||
|
note.style.display = 'block';
|
||||||
|
note.style.marginTop = '.25rem';
|
||||||
|
note.textContent = message;
|
||||||
|
field.insertAdjacentElement('afterend', note);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if (first) {
|
||||||
|
first.scrollIntoView({block:'center', behavior:'smooth'});
|
||||||
|
window.setTimeout(function () { first.focus(); }, 150);
|
||||||
|
} else {
|
||||||
|
summary.scrollIntoView({block:'center', behavior:'smooth'});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function submitEditor(form, editDialog) {
|
||||||
|
clearValidation(form);
|
||||||
|
if (!form.reportValidity()) return;
|
||||||
|
|
||||||
|
var submit = form.querySelector('button[type="submit"]');
|
||||||
|
if (submit) submit.disabled = true;
|
||||||
|
|
||||||
|
var body = new FormData(form);
|
||||||
|
fetch('plugins/bratonien_tools/nc-connector-edit-save.php', {
|
||||||
|
method:'POST',
|
||||||
|
credentials:'same-origin',
|
||||||
|
cache:'no-store',
|
||||||
|
headers:{'Accept':'application/json'},
|
||||||
|
body:body
|
||||||
|
}).then(function (response) {
|
||||||
|
return response.json().then(function (data) {
|
||||||
|
if (!response.ok || !data.ok) {
|
||||||
|
showValidation(form, data);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
editDialog.close();
|
||||||
|
window.location.reload();
|
||||||
|
});
|
||||||
|
}).catch(function (error) {
|
||||||
|
showValidation(form, {message:error.message || String(error), fields:[]});
|
||||||
|
}).finally(function () {
|
||||||
|
if (submit) submit.disabled = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function openEditor(id) {
|
||||||
|
var editDialog = dialog();
|
||||||
|
var content = editDialog.querySelector('[data-edit-v2-content]');
|
||||||
|
content.innerHTML = '<p class="bratonien-base-note">Verbindung wird geladen …</p>';
|
||||||
|
if (typeof editDialog.showModal === 'function') editDialog.showModal();
|
||||||
|
else editDialog.setAttribute('open', 'open');
|
||||||
|
|
||||||
|
loadConnection(id).then(function (data) {
|
||||||
|
if (data.adapter !== 'local') throw new Error('Diese Ansicht ist nur für die bestehende Legacy-Verbindung vorgesehen.');
|
||||||
|
var legacy = data.legacy || {};
|
||||||
|
var webdav = data.webdav || {};
|
||||||
|
var storages = Array.isArray(legacy.storages) ? legacy.storages : [];
|
||||||
|
var rows = storages.map(storageRow).join('') || storageRow({});
|
||||||
|
var migrationText = webdav.migration_ready
|
||||||
|
? '<strong>Bereit.</strong> Nextcloud-Zugang und verbindungseigener Piwigo-API-Key sind vollständig gespeichert.'
|
||||||
|
: '<strong>Noch nicht bereit.</strong> Es fehlen: '+escapeHtml((webdav.migration_missing || []).join(', ') || 'WebDAV-Zugangsdaten')+'.';
|
||||||
|
|
||||||
|
content.innerHTML = '<form method="post" data-edit-v2-form>'
|
||||||
|
+ '<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'
|
||||||
|
+ '<input type="hidden" name="connection_id" value="'+escapeHtml(data.id)+'">'
|
||||||
|
+ '<h5>Verbindung</h5><div class="bratonien-form-grid">'
|
||||||
|
+ '<label class="bratonien-label">Name</label><input name="connection_name" value="'+escapeHtml(data.name)+'" required>'
|
||||||
|
+ '</div>'
|
||||||
|
+ '<h5 style="margin-top:1.2rem">Nextcloud / WebDAV</h5>'
|
||||||
|
+ '<p class="bratonien-base-note">Diese Angaben werden für den neuen WebDAV-Weg benötigt und gehören zu genau dieser Verbindung.</p>'
|
||||||
|
+ '<div class="bratonien-form-grid">'
|
||||||
|
+ '<label class="bratonien-label">Nextcloud-Adresse</label><input name="nc_nextcloud_url" value="'+escapeHtml(webdav.nextcloud_url || '')+'" placeholder="https://cloud.example.de">'
|
||||||
|
+ '<label class="bratonien-label">Nextcloud-Benutzer</label><input name="nc_nextcloud_user" value="'+escapeHtml(webdav.nextcloud_user || '')+'" autocomplete="username">'
|
||||||
|
+ '<label class="bratonien-label">Nextcloud-Passwort</label><input name="nc_nextcloud_password" type="password" autocomplete="current-password" placeholder="'+(webdav.has_nextcloud_password ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
|
||||||
|
+ '</div>'
|
||||||
|
+ '<h5 style="margin-top:1.2rem">Piwigo API dieser Verbindung</h5>'
|
||||||
|
+ '<p class="bratonien-base-note">Der API-Key wird verbindungseigen gespeichert und beim Speichern geprüft.</p>'
|
||||||
|
+ '<div class="bratonien-form-grid">'
|
||||||
|
+ '<label class="bratonien-label">API-Schlüssel-ID</label><input name="nc_connection_api_key_id" value="'+escapeHtml(webdav.api_key_id || '')+'" autocomplete="off">'
|
||||||
|
+ '<label class="bratonien-label">API-Geheimnis</label><input name="nc_connection_api_key_secret" type="password" autocomplete="new-password" placeholder="'+(webdav.has_api_key_secret ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
|
||||||
|
+ '</div>'
|
||||||
|
+ '<p class="bratonien-base-note"><strong>WebDAV-Migration:</strong> '+migrationText+'</p>'
|
||||||
|
+ '<h5 style="margin-top:1.2rem">Bestehender Legacy-Weg</h5><div class="bratonien-form-grid">'
|
||||||
|
+ '<label class="bratonien-label">Datenbank-Server</label><input name="nc_host" value="'+escapeHtml(legacy.host)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Port</label><input name="nc_port" type="number" min="1" max="65535" value="'+escapeHtml(legacy.port || 5432)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Datenbank</label><input name="nc_database" value="'+escapeHtml(legacy.database)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Reader-Benutzer</label><input name="nc_user" value="'+escapeHtml(legacy.user)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Reader-Passwort</label><input name="nc_db_password" type="password" autocomplete="new-password" placeholder="'+(legacy.has_db_password ? 'gespeichert – leer = unverändert' : 'noch nicht gespeichert')+'">'
|
||||||
|
+ '</div>'
|
||||||
|
+ '<h5 style="margin-top:1.2rem">Speicherorte</h5><div data-storage-list>'+rows+'</div>'
|
||||||
|
+ '<button type="button" class="buttonLike" data-add-storage>Speicherort hinzufügen</button>'
|
||||||
|
+ '<details style="margin-top:1rem"><summary>Erweiterte Legacy-Einstellungen</summary><div class="bratonien-form-grid" style="margin-top:.75rem">'
|
||||||
|
+ '<label class="bratonien-label">Source-View</label><input name="nc_source_view" value="'+escapeHtml(legacy.source_view)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Activity-View</label><input name="nc_activity_view" value="'+escapeHtml(legacy.activity_view)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Piwigo-Galerieordner</label><input name="nc_gallery_root" value="'+escapeHtml(legacy.gallery_root)+'" required>'
|
||||||
|
+ '<label class="bratonien-label">Ruhezeit (Sek.)</label><input name="nc_quiet_seconds" type="number" min="0" value="'+escapeHtml(legacy.quiet_seconds)+'">'
|
||||||
|
+ '<label class="bratonien-label">Maximale Wartezeit (Sek.)</label><input name="nc_max_wait_seconds" type="number" min="60" value="'+escapeHtml(legacy.max_wait_seconds)+'">'
|
||||||
|
+ '<label class="bratonien-label">Vollprüfung nach (Sek.)</label><input name="nc_full_sync_seconds" type="number" min="300" value="'+escapeHtml(legacy.full_sync_seconds)+'">'
|
||||||
|
+ '</div></details>'
|
||||||
|
+ '<div class="bratonien-actions" style="margin-top:1rem"><button class="buttonLike" type="submit">Änderungen prüfen und speichern</button><button class="buttonLike" type="button" data-edit-v2-cancel>Abbrechen</button></div>'
|
||||||
|
+ '</form>';
|
||||||
|
|
||||||
|
var form = content.querySelector('[data-edit-v2-form]');
|
||||||
|
form.querySelector('[data-edit-v2-cancel]').addEventListener('click', function () { editDialog.close(); });
|
||||||
|
form.querySelector('[data-add-storage]').addEventListener('click', function () {
|
||||||
|
form.querySelector('[data-storage-list]').insertAdjacentHTML('beforeend', storageRow({}));
|
||||||
|
});
|
||||||
|
form.addEventListener('click', function (event) {
|
||||||
|
var remove = event.target.closest('[data-remove-storage]');
|
||||||
|
if (!remove) return;
|
||||||
|
var row = remove.closest('[data-storage-row]');
|
||||||
|
if (row) row.remove();
|
||||||
|
});
|
||||||
|
form.addEventListener('submit', function (event) {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
submitEditor(form, editDialog);
|
||||||
|
});
|
||||||
|
}).catch(function (error) {
|
||||||
|
content.innerHTML = '<p class="bratonien-main-cache__warning"><strong>Bearbeiten nicht möglich:</strong> '+escapeHtml(error.message || String(error))+'</p>';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function rebuildLocalActions(deleteForm, id, connectionData) {
|
||||||
|
var actions = deleteForm.parentElement;
|
||||||
|
if (!actions) return;
|
||||||
|
|
||||||
|
[].slice.call(actions.querySelectorAll('form')).forEach(function (form) {
|
||||||
|
var migrate = form.querySelector('button[value="nc_connector_migrate_start"]');
|
||||||
|
var editStart = form.querySelector('button[value="nc_connector_edit_start"]');
|
||||||
|
if (migrate || editStart) form.remove();
|
||||||
|
});
|
||||||
|
[].slice.call(actions.children).forEach(function (child) {
|
||||||
|
if (child.tagName === 'BUTTON' && (child.textContent || '').trim() === 'Bearbeiten') child.remove();
|
||||||
|
if (child.dataset && child.dataset.ncMigrationInfo) child.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
var edit = document.createElement('button');
|
||||||
|
edit.type = 'button';
|
||||||
|
edit.className = 'buttonLike';
|
||||||
|
edit.textContent = 'Bearbeiten';
|
||||||
|
edit.addEventListener('click', function () { openEditor(id); });
|
||||||
|
actions.insertBefore(edit, deleteForm);
|
||||||
|
|
||||||
|
var info = document.createElement('span');
|
||||||
|
info.dataset.ncMigrationInfo = '1';
|
||||||
|
info.className = 'bratonien-base-note';
|
||||||
|
info.textContent = 'WebDAV-Migration wird geprüft …';
|
||||||
|
actions.insertBefore(info, deleteForm);
|
||||||
|
|
||||||
|
var dataPromise = connectionData ? Promise.resolve(connectionData) : loadConnection(id);
|
||||||
|
dataPromise.then(function (data) {
|
||||||
|
var webdav = data.webdav || {};
|
||||||
|
if (webdav.migration_ready) {
|
||||||
|
info.remove();
|
||||||
|
actions.insertBefore(postForm('Auf WebDAV migrieren', 'nc_connector_migrate_start', id, 'migrate'), deleteForm);
|
||||||
|
} else {
|
||||||
|
var missing = (webdav.migration_missing || []).join(', ');
|
||||||
|
info.textContent = 'WebDAV-Migration noch nicht bereit: '+(missing || 'Zugangsdaten fehlen')+'. Zuerst „Bearbeiten“.';
|
||||||
|
}
|
||||||
|
}).catch(function (error) {
|
||||||
|
info.textContent = 'WebDAV-Migration kann nicht geprüft werden: '+(error.message || String(error));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function rebuildRemoteActions(deleteForm, id) {
|
||||||
|
var actions = deleteForm.parentElement;
|
||||||
|
if (!actions) return;
|
||||||
|
[].slice.call(actions.querySelectorAll('form')).forEach(function (form) {
|
||||||
|
var oldEdit = form.querySelector('button[value="nc_connector_edit_start"]');
|
||||||
|
var oldMigrate = form.querySelector('button[value="nc_connector_migrate_start"]');
|
||||||
|
if (oldEdit || oldMigrate) form.remove();
|
||||||
|
});
|
||||||
|
[].slice.call(actions.children).forEach(function (child) {
|
||||||
|
if (child.tagName === 'BUTTON' && (child.textContent || '').trim() === 'Bearbeiten') child.remove();
|
||||||
|
if (child.dataset && child.dataset.ncMigrationInfo) child.remove();
|
||||||
|
});
|
||||||
|
actions.insertBefore(postForm('Bearbeiten', 'nc_connector_edit_start', id, 'edit'), deleteForm);
|
||||||
|
}
|
||||||
|
|
||||||
|
[].slice.call(section.querySelectorAll('button[value="nc_connector_edit_start"]')).forEach(function (button) {
|
||||||
|
var form = button.closest('form');
|
||||||
|
if (form) form.remove();
|
||||||
|
});
|
||||||
|
|
||||||
|
[].slice.call(section.querySelectorAll('button[value="nc_connector_delete"]')).forEach(function (deleteButton) {
|
||||||
|
var deleteForm = deleteButton.closest('form');
|
||||||
|
if (!deleteForm) return;
|
||||||
|
var idInput = deleteForm.querySelector('input[name="connection_id"]');
|
||||||
|
if (!idInput) return;
|
||||||
|
var id = idInput.value;
|
||||||
|
|
||||||
|
loadConnection(id).then(function (data) {
|
||||||
|
if (data.adapter === 'local') rebuildLocalActions(deleteForm, id, data);
|
||||||
|
else rebuildRemoteActions(deleteForm, id);
|
||||||
|
}).catch(function (error) {
|
||||||
|
var actions = deleteForm.parentElement;
|
||||||
|
if (!actions) return;
|
||||||
|
var info = document.createElement('span');
|
||||||
|
info.className = 'bratonien-main-cache__warning';
|
||||||
|
info.textContent = 'Verbindungstyp konnte nicht geladen werden: '+(error.message || String(error));
|
||||||
|
actions.insertBefore(info, deleteForm);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
})();
|
||||||
219
js/nc_connector_source_ui.js
Normal file
219
js/nc_connector_source_ui.js
Normal file
@@ -0,0 +1,219 @@
|
|||||||
|
(function () {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
function escapeHtml(value) {
|
||||||
|
return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
|
||||||
|
return {'&':'&','<':'<','>':'>','"':'"',"'":'''}[c];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function fieldNodes(form, fieldName) {
|
||||||
|
return [].slice.call(form.querySelectorAll('[name="'+fieldName.replace(/"/g, '\\"')+'"]'));
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearPickerErrors(form) {
|
||||||
|
[].slice.call(form.querySelectorAll('[data-source-picker-error]')).forEach(function (node) { node.remove(); });
|
||||||
|
[].slice.call(form.querySelectorAll('[data-source-picker-invalid="1"]')).forEach(function (field) {
|
||||||
|
field.removeAttribute('data-source-picker-invalid');
|
||||||
|
if (field.getAttribute('aria-invalid') === 'true') field.removeAttribute('aria-invalid');
|
||||||
|
field.style.borderColor = '';
|
||||||
|
field.style.boxShadow = '';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function showPickerError(form, data) {
|
||||||
|
clearPickerErrors(form);
|
||||||
|
var message = data && data.message ? data.message : 'Die Nextcloud-Ordnerauswahl konnte nicht gestartet werden.';
|
||||||
|
var fields = data && Array.isArray(data.fields) ? data.fields : [];
|
||||||
|
|
||||||
|
var summary = document.createElement('div');
|
||||||
|
summary.dataset.sourcePickerError = '1';
|
||||||
|
summary.className = 'bratonien-main-cache__warning';
|
||||||
|
summary.style.margin = '0 0 1rem';
|
||||||
|
summary.style.padding = '.75rem';
|
||||||
|
summary.style.border = '1px solid currentColor';
|
||||||
|
summary.innerHTML = '<strong>Ordnerauswahl nicht möglich:</strong> '+escapeHtml(message);
|
||||||
|
form.insertBefore(summary, form.firstChild);
|
||||||
|
|
||||||
|
var first = null;
|
||||||
|
fields.forEach(function (fieldName) {
|
||||||
|
fieldNodes(form, fieldName).forEach(function (field) {
|
||||||
|
field.dataset.sourcePickerInvalid = '1';
|
||||||
|
field.setAttribute('aria-invalid', 'true');
|
||||||
|
field.style.borderColor = '#d65a5a';
|
||||||
|
field.style.boxShadow = '0 0 0 1px #d65a5a';
|
||||||
|
if (!first) first = field;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
if (first) {
|
||||||
|
first.scrollIntoView({block:'center', behavior:'smooth'});
|
||||||
|
window.setTimeout(function () { first.focus(); }, 150);
|
||||||
|
} else {
|
||||||
|
summary.scrollIntoView({block:'center', behavior:'smooth'});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function jsonResponse(response) {
|
||||||
|
return response.json().then(function (data) {
|
||||||
|
if (!response.ok || !data.ok) throw data;
|
||||||
|
return data;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function startSourcePicker(form, button) {
|
||||||
|
clearPickerErrors(form);
|
||||||
|
if (!form.reportValidity()) return;
|
||||||
|
|
||||||
|
button.disabled = true;
|
||||||
|
var originalText = button.textContent;
|
||||||
|
button.textContent = 'Verbindung prüfen …';
|
||||||
|
|
||||||
|
var saveBody = new FormData(form);
|
||||||
|
fetch('plugins/bratonien_tools/nc-connector-edit-save.php', {
|
||||||
|
method:'POST',
|
||||||
|
credentials:'same-origin',
|
||||||
|
cache:'no-store',
|
||||||
|
headers:{'Accept':'application/json'},
|
||||||
|
body:saveBody
|
||||||
|
})
|
||||||
|
.then(jsonResponse)
|
||||||
|
.then(function () {
|
||||||
|
button.textContent = 'Nextcloud-Ordner laden …';
|
||||||
|
var pickerBody = new FormData();
|
||||||
|
var token = form.querySelector('input[name="pwg_token"]');
|
||||||
|
var id = form.querySelector('input[name="connection_id"]');
|
||||||
|
pickerBody.append('pwg_token', token ? token.value : '');
|
||||||
|
pickerBody.append('connection_id', id ? id.value : '');
|
||||||
|
return fetch('plugins/bratonien_tools/nc-connector-source-picker-start.php', {
|
||||||
|
method:'POST',
|
||||||
|
credentials:'same-origin',
|
||||||
|
cache:'no-store',
|
||||||
|
headers:{'Accept':'application/json'},
|
||||||
|
body:pickerBody
|
||||||
|
}).then(jsonResponse);
|
||||||
|
})
|
||||||
|
.then(function () {
|
||||||
|
try {
|
||||||
|
sessionStorage.setItem('bratonienNcWizardMode', 'migrate');
|
||||||
|
sessionStorage.setItem('bratonienNcWizardOpen', '1');
|
||||||
|
} catch (e) {}
|
||||||
|
window.location.reload();
|
||||||
|
})
|
||||||
|
.catch(function (error) {
|
||||||
|
showPickerError(form, error && typeof error === 'object' ? error : {message:String(error), fields:[]});
|
||||||
|
button.disabled = false;
|
||||||
|
button.textContent = originalText;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function enhanceMigrationButtons(root) {
|
||||||
|
var label = 'Nextcloud-Ordner auswählen & migrieren';
|
||||||
|
var title = 'Die WebDAV-Quelle wird im Nextcloud-Ordnerbrowser ausgewählt. Der bestehende SMB-/Legacy-Speicher wird nicht als WebDAV-Quelle übernommen.';
|
||||||
|
[].slice.call(root.querySelectorAll('button[value="nc_connector_migrate_start"]')).forEach(function (button) {
|
||||||
|
if (button.textContent !== label) button.textContent = label;
|
||||||
|
if (button.title !== title) button.title = title;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function enhanceEditor(root) {
|
||||||
|
var form = root.querySelector('[data-edit-v2-form]');
|
||||||
|
if (!form || form.dataset.sourceUiEnhanced === '1') return;
|
||||||
|
form.dataset.sourceUiEnhanced = '1';
|
||||||
|
|
||||||
|
var headings = [].slice.call(form.querySelectorAll('h5'));
|
||||||
|
var webdavHeading = headings.find(function (node) {
|
||||||
|
return (node.textContent || '').trim() === 'Nextcloud / WebDAV';
|
||||||
|
});
|
||||||
|
var legacyHeading = headings.find(function (node) {
|
||||||
|
return (node.textContent || '').trim() === 'Bestehender Legacy-Weg';
|
||||||
|
});
|
||||||
|
var storageHeading = headings.find(function (node) {
|
||||||
|
return (node.textContent || '').trim() === 'Speicherorte';
|
||||||
|
});
|
||||||
|
var storageList = form.querySelector('[data-storage-list]');
|
||||||
|
var addStorage = form.querySelector('[data-add-storage]');
|
||||||
|
|
||||||
|
if (webdavHeading && !form.querySelector('[data-webdav-source-picker]')) {
|
||||||
|
var webdavGrid = webdavHeading.nextElementSibling;
|
||||||
|
while (webdavGrid && !webdavGrid.classList.contains('bratonien-form-grid')) webdavGrid = webdavGrid.nextElementSibling;
|
||||||
|
if (webdavGrid) {
|
||||||
|
var picker = document.createElement('div');
|
||||||
|
picker.dataset.webdavSourcePicker = '1';
|
||||||
|
picker.style.margin = '.8rem 0 1rem';
|
||||||
|
picker.innerHTML = '<p class="bratonien-base-note" style="margin:.25rem 0 .5rem"><strong>WebDAV-Quelle:</strong> Du musst keinen Pfad kennen. Die Ordner des oben eingetragenen Nextcloud-Benutzers werden automatisch geladen und können anschließend ausgewählt werden.</p>';
|
||||||
|
var button = document.createElement('button');
|
||||||
|
button.type = 'button';
|
||||||
|
button.className = 'buttonLike';
|
||||||
|
button.textContent = 'Nextcloud-Ordner automatisch auswählen';
|
||||||
|
button.addEventListener('click', function () { startSourcePicker(form, button); });
|
||||||
|
picker.appendChild(button);
|
||||||
|
webdavGrid.insertAdjacentElement('afterend', picker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (legacyHeading && !form.querySelector('[data-webdav-source-note]')) {
|
||||||
|
var note = document.createElement('p');
|
||||||
|
note.dataset.webdavSourceNote = '1';
|
||||||
|
note.className = 'bratonien-main-cache__warning';
|
||||||
|
note.innerHTML = '<strong>Wichtig:</strong> Der folgende SMB-/lokale Speicher gehört ausschließlich zum bisherigen Legacy-Fallback. Er wird <strong>nicht</strong> als WebDAV-Quelle übernommen.';
|
||||||
|
legacyHeading.insertAdjacentElement('beforebegin', note);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (storageHeading && storageList && addStorage) {
|
||||||
|
storageHeading.textContent = 'Legacy-Speicher (nur Fallback)';
|
||||||
|
|
||||||
|
var details = document.createElement('details');
|
||||||
|
details.dataset.legacyStorageTechnical = '1';
|
||||||
|
details.style.marginTop = '.75rem';
|
||||||
|
var summary = document.createElement('summary');
|
||||||
|
summary.textContent = 'Technische Legacy-Speicherzuordnung bearbeiten';
|
||||||
|
details.appendChild(summary);
|
||||||
|
|
||||||
|
var info = document.createElement('p');
|
||||||
|
info.className = 'bratonien-base-note';
|
||||||
|
info.textContent = 'Diese Felder betreffen nur den alten Fallback-Weg. Für WebDAV werden keine SMB-Adressen oder lokalen Mount-Pfade eingegeben.';
|
||||||
|
details.appendChild(info);
|
||||||
|
|
||||||
|
storageHeading.insertAdjacentElement('beforebegin', details);
|
||||||
|
details.appendChild(storageHeading);
|
||||||
|
details.appendChild(storageList);
|
||||||
|
details.appendChild(addStorage);
|
||||||
|
|
||||||
|
addStorage.textContent = 'Legacy-Speicher manuell hinzufügen';
|
||||||
|
addStorage.title = 'Nur für den alten Legacy-Fallback. WebDAV-Ordner werden im Nextcloud-Ordnerbrowser ausgewählt.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function enhance(root) {
|
||||||
|
if (!root || root.nodeType !== 1) return;
|
||||||
|
enhanceMigrationButtons(root);
|
||||||
|
if (root.matches && root.matches('#bratonien-nc-connection-edit-v2')) enhanceEditor(root);
|
||||||
|
var dialog = root.querySelector ? root.querySelector('#bratonien-nc-connection-edit-v2') : null;
|
||||||
|
if (dialog) enhanceEditor(dialog);
|
||||||
|
}
|
||||||
|
|
||||||
|
function start() {
|
||||||
|
var section = document.getElementById('nc-connector');
|
||||||
|
if (!section) return;
|
||||||
|
|
||||||
|
enhance(section);
|
||||||
|
enhanceMigrationButtons(document);
|
||||||
|
|
||||||
|
var observer = new MutationObserver(function (mutations) {
|
||||||
|
mutations.forEach(function (mutation) {
|
||||||
|
[].slice.call(mutation.addedNodes || []).forEach(function (node) {
|
||||||
|
if (node && node.nodeType === 1) enhance(node);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
var dialog = document.getElementById('bratonien-nc-connection-edit-v2');
|
||||||
|
if (dialog) enhanceEditor(dialog);
|
||||||
|
enhanceMigrationButtons(document);
|
||||||
|
});
|
||||||
|
|
||||||
|
observer.observe(document.body, {childList:true, subtree:true});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (document.readyState === 'loading') document.addEventListener('DOMContentLoaded', start);
|
||||||
|
else start();
|
||||||
|
})();
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
Plugin Name: Bratonien Tools
|
Plugin Name: Bratonien Tools
|
||||||
Version: 0.9.6.1
|
Version: 0.9.6.20
|
||||||
Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
|
Description: Erweiterbare Administrationswerkzeuge fuer die Bratonien-Piwigo-Installation.
|
||||||
Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
|
Plugin URI: https://github.com/Terranom674/Piwigo_Bratonien_Tools
|
||||||
Author: Bratonien
|
Author: Bratonien
|
||||||
|
|||||||
100
nc-connector-edit-data.php
Normal file
100
nc-connector-edit-data.php
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
<?php
|
||||||
|
$piwigo_root = realpath(dirname(__DIR__, 2));
|
||||||
|
if ($piwigo_root === false)
|
||||||
|
{
|
||||||
|
http_response_code(500);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
|
||||||
|
include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
|
||||||
|
|
||||||
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
|
header('Cache-Control: no-store, max-age=0');
|
||||||
|
|
||||||
|
if (!defined('BRATONIEN_TOOLS_PATH'))
|
||||||
|
{
|
||||||
|
http_response_code(404);
|
||||||
|
echo json_encode(array('error'=>'Bratonien Tools ist nicht aktiv.'));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
if (!function_exists('is_admin') || !is_admin())
|
||||||
|
{
|
||||||
|
http_response_code(403);
|
||||||
|
echo json_encode(array('error'=>'Administratorrechte erforderlich.'));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector.inc.php');
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector_manage.inc.php');
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector_connection_scope.inc.php');
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH.'include/nc_connector_edit.inc.php');
|
||||||
|
|
||||||
|
$id = (int)($_GET['connection_id'] ?? 0);
|
||||||
|
$connection = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
if (!$connection)
|
||||||
|
{
|
||||||
|
http_response_code(404);
|
||||||
|
echo json_encode(array('error'=>'Connector-Verbindung wurde nicht gefunden.'));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$credentials = array();
|
||||||
|
$migration = array('ready'=>false, 'missing'=>array());
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
if ((string)$connection['adapter'] === 'local')
|
||||||
|
{
|
||||||
|
$migration = bratonien_tools_nc_connector_migration_state($connection);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
$credentials = array();
|
||||||
|
$migration = array('ready'=>false, 'missing'=>array('gespeicherte Zugangsdaten konnten nicht gelesen werden'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$storages = array();
|
||||||
|
foreach ((array)($config['storages'] ?? array()) as $storage)
|
||||||
|
{
|
||||||
|
$storages[] = array(
|
||||||
|
'storage_id'=>(string)($storage['storage_id'] ?? ''),
|
||||||
|
'source_prefix'=>(string)($storage['source_prefix'] ?? ''),
|
||||||
|
'local_mount'=>(string)($storage['local_mount'] ?? ''),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$payload = array(
|
||||||
|
'id'=>(int)$connection['id'],
|
||||||
|
'name'=>(string)$connection['name'],
|
||||||
|
'adapter'=>(string)$connection['adapter'],
|
||||||
|
'enabled'=>(bool)$connection['enabled'],
|
||||||
|
'takeover_state'=>(string)$connection['takeover_state'],
|
||||||
|
'source_mode'=>(string)($config['source_mode'] ?? ''),
|
||||||
|
'legacy'=>array(
|
||||||
|
'host'=>(string)($config['host'] ?? ''),
|
||||||
|
'port'=>(string)($config['port'] ?? '5432'),
|
||||||
|
'database'=>(string)($config['database'] ?? ''),
|
||||||
|
'user'=>(string)($config['user'] ?? ''),
|
||||||
|
'has_db_password'=>trim((string)($credentials['db_password'] ?? '')) !== '',
|
||||||
|
'source_view'=>(string)($config['source_view'] ?? ''),
|
||||||
|
'activity_view'=>(string)($config['activity_view'] ?? ''),
|
||||||
|
'gallery_root'=>(string)($config['gallery_root'] ?? ''),
|
||||||
|
'quiet_seconds'=>(int)($config['quiet_seconds'] ?? 120),
|
||||||
|
'max_wait_seconds'=>(int)($config['max_wait_seconds'] ?? 900),
|
||||||
|
'full_sync_seconds'=>(int)($config['full_sync_seconds'] ?? 86400),
|
||||||
|
'storages'=>$storages,
|
||||||
|
),
|
||||||
|
'webdav'=>array(
|
||||||
|
'nextcloud_url'=>(string)($config['nextcloud_url'] ?? ''),
|
||||||
|
'nextcloud_user'=>(string)($credentials['nextcloud_user'] ?? $config['nextcloud_access_user'] ?? $config['access_user'] ?? ''),
|
||||||
|
'has_nextcloud_password'=>(string)($credentials['nextcloud_password'] ?? '') !== '',
|
||||||
|
'api_key_id'=>(string)($credentials['api_key_id'] ?? ''),
|
||||||
|
'has_api_key_secret'=>trim((string)($credentials['api_key_secret'] ?? '')) !== '',
|
||||||
|
'migration_ready'=>!empty($migration['ready']),
|
||||||
|
'migration_missing'=>array_values((array)($migration['missing'] ?? array())),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
312
nc-connector-edit-save.php
Normal file
312
nc-connector-edit-save.php
Normal file
@@ -0,0 +1,312 @@
|
|||||||
|
<?php
|
||||||
|
$piwigo_root = realpath(dirname(__DIR__, 2));
|
||||||
|
if ($piwigo_root === false)
|
||||||
|
{
|
||||||
|
http_response_code(500);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
|
||||||
|
include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
|
||||||
|
|
||||||
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
|
header('Cache-Control: no-store, max-age=0');
|
||||||
|
|
||||||
|
function bratonien_tools_nc_edit_json($status, array $payload)
|
||||||
|
{
|
||||||
|
http_response_code((int)$status);
|
||||||
|
echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_edit_fail($message, array $fields = array(), $stage = '', $detail = '')
|
||||||
|
{
|
||||||
|
$visible = trim((string)$message);
|
||||||
|
if ($stage !== '') $visible = 'Bereich: '.$stage.' — '.$visible;
|
||||||
|
if ($detail !== '') $visible .= ' Technische Ursache: '.$detail;
|
||||||
|
|
||||||
|
bratonien_tools_nc_edit_json(422, array(
|
||||||
|
'ok'=>false,
|
||||||
|
'message'=>$visible,
|
||||||
|
'stage'=>(string)$stage,
|
||||||
|
'detail'=>(string)$detail,
|
||||||
|
'fields'=>array_values(array_unique($fields)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_edit_probe($url, $username = '', $password = '', array $headers = array())
|
||||||
|
{
|
||||||
|
if (!function_exists('curl_init'))
|
||||||
|
{
|
||||||
|
return array('ok'=>false, 'http'=>0, 'errno'=>-1, 'error'=>'cURL ist in PHP nicht verfügbar.', 'body'=>'');
|
||||||
|
}
|
||||||
|
|
||||||
|
$ch = curl_init($url);
|
||||||
|
$options = array(
|
||||||
|
CURLOPT_RETURNTRANSFER=>true,
|
||||||
|
CURLOPT_FOLLOWLOCATION=>true,
|
||||||
|
CURLOPT_MAXREDIRS=>3,
|
||||||
|
CURLOPT_CONNECTTIMEOUT=>8,
|
||||||
|
CURLOPT_TIMEOUT=>15,
|
||||||
|
CURLOPT_HTTPHEADER=>array_merge(array('Accept: application/json'), $headers),
|
||||||
|
CURLOPT_USERAGENT=>'Bratonien-Tools-NC-Editor/'.(function_exists('bratonien_tools_current_version') ? bratonien_tools_current_version() : 'dev'),
|
||||||
|
);
|
||||||
|
if ($username !== '')
|
||||||
|
{
|
||||||
|
$options[CURLOPT_HTTPAUTH] = CURLAUTH_BASIC;
|
||||||
|
$options[CURLOPT_USERPWD] = $username.':'.$password;
|
||||||
|
}
|
||||||
|
curl_setopt_array($ch, $options);
|
||||||
|
$body = curl_exec($ch);
|
||||||
|
$errno = curl_errno($ch);
|
||||||
|
$error = curl_error($ch);
|
||||||
|
$http = (int)curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
|
curl_close($ch);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
'ok'=>$body !== false && $errno === 0,
|
||||||
|
'http'=>$http,
|
||||||
|
'errno'=>$errno,
|
||||||
|
'error'=>$error,
|
||||||
|
'body'=>$body === false ? '' : (string)$body,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!defined('BRATONIEN_TOOLS_PATH'))
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_json(404, array('ok'=>false, 'message'=>'Bratonien Tools ist nicht aktiv.', 'fields'=>array()));
|
||||||
|
}
|
||||||
|
if (!function_exists('is_admin') || !is_admin())
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_json(403, array('ok'=>false, 'message'=>'Administratorrechte erforderlich.', 'fields'=>array()));
|
||||||
|
}
|
||||||
|
if (($_SERVER['REQUEST_METHOD'] ?? '') !== 'POST')
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_json(405, array('ok'=>false, 'message'=>'Nur POST ist erlaubt.', 'fields'=>array()));
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
check_pwg_token();
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH.'include/tool_registry.inc.php');
|
||||||
|
|
||||||
|
$id = (int)($_POST['connection_id'] ?? 0);
|
||||||
|
$connection = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
if (!$connection)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail('Die zu bearbeitende Verbindung wurde nicht gefunden.', array(), 'Verbindung');
|
||||||
|
}
|
||||||
|
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
|
||||||
|
$nextcloud_input = trim((string)($_POST['nc_nextcloud_url'] ?? ($config['nextcloud_url'] ?? '')));
|
||||||
|
$nextcloud_user = trim((string)($_POST['nc_nextcloud_user'] ?? ($credentials['nextcloud_user'] ?? '')));
|
||||||
|
$submitted_nc_password = (string)($_POST['nc_nextcloud_password'] ?? '');
|
||||||
|
$nextcloud_password = $submitted_nc_password !== '' ? $submitted_nc_password : (string)($credentials['nextcloud_password'] ?? '');
|
||||||
|
|
||||||
|
$has_any_nextcloud = $nextcloud_input !== '' || $nextcloud_user !== '' || $nextcloud_password !== '';
|
||||||
|
if ($has_any_nextcloud)
|
||||||
|
{
|
||||||
|
$missing = array();
|
||||||
|
if ($nextcloud_input === '') $missing[] = 'nc_nextcloud_url';
|
||||||
|
if ($nextcloud_user === '') $missing[] = 'nc_nextcloud_user';
|
||||||
|
if ($nextcloud_password === '') $missing[] = 'nc_nextcloud_password';
|
||||||
|
if ($missing)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Die WebDAV-Daten sind unvollständig. Adresse, Benutzer und Passwort werden gemeinsam benötigt.',
|
||||||
|
$missing,
|
||||||
|
'Nextcloud / WebDAV'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$candidate_urls = bratonien_tools_nc_wizard_candidate_urls($nextcloud_input);
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail($e->getMessage(), array('nc_nextcloud_url'), 'Nextcloud / WebDAV');
|
||||||
|
}
|
||||||
|
|
||||||
|
$nextcloud_url = '';
|
||||||
|
$last_probe = null;
|
||||||
|
$last_status_url = '';
|
||||||
|
foreach ($candidate_urls as $candidate_url)
|
||||||
|
{
|
||||||
|
$status_url = $candidate_url.'/status.php';
|
||||||
|
$probe = bratonien_tools_nc_edit_probe($status_url);
|
||||||
|
$last_probe = $probe;
|
||||||
|
$last_status_url = $status_url;
|
||||||
|
|
||||||
|
if (!$probe['ok'] || $probe['http'] < 200 || $probe['http'] >= 300)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$status = json_decode($probe['body'], true);
|
||||||
|
if (!is_array($status) || empty($status['installed']))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$nextcloud_url = $candidate_url;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($nextcloud_url === '')
|
||||||
|
{
|
||||||
|
$attempts = array();
|
||||||
|
foreach ($candidate_urls as $candidate_url)
|
||||||
|
{
|
||||||
|
$attempts[] = $candidate_url.'/status.php';
|
||||||
|
}
|
||||||
|
if (is_array($last_probe) && !$last_probe['ok'])
|
||||||
|
{
|
||||||
|
$technical = $last_probe['errno'] >= 0
|
||||||
|
? 'cURL '.$last_probe['errno'].($last_probe['error'] !== '' ? ': '.$last_probe['error'] : '')
|
||||||
|
: $last_probe['error'];
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Die Nextcloud-Adresse ist vom Piwigo-Server aus nicht erreichbar. Ohne angegebenes Protokoll wurden HTTPS und HTTP geprüft.',
|
||||||
|
array('nc_nextcloud_url'),
|
||||||
|
'Nextcloud / WebDAV – Erreichbarkeit',
|
||||||
|
$technical.' · Geprüft: '.implode(' ; ', $attempts)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Unter der angegebenen Adresse wurde keine erreichbare installierte Nextcloud gefunden. Ohne angegebenes Protokoll wurden HTTPS und HTTP geprüft.',
|
||||||
|
array('nc_nextcloud_url'),
|
||||||
|
'Nextcloud / WebDAV – Erkennung',
|
||||||
|
'Geprüft: '.implode(' ; ', $attempts).($last_probe ? ' · Letzter HTTP-Status: '.$last_probe['http'] : '')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$_POST['nc_nextcloud_url'] = $nextcloud_url;
|
||||||
|
|
||||||
|
$user_url = $nextcloud_url.'/ocs/v2.php/cloud/user?format=json';
|
||||||
|
$user_probe = bratonien_tools_nc_edit_probe($user_url, $nextcloud_user, $nextcloud_password, array('OCS-APIRequest: true'));
|
||||||
|
if (!$user_probe['ok'])
|
||||||
|
{
|
||||||
|
$technical = $user_probe['errno'] >= 0
|
||||||
|
? 'cURL '.$user_probe['errno'].($user_probe['error'] !== '' ? ': '.$user_probe['error'] : '')
|
||||||
|
: $user_probe['error'];
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Die Nextcloud-Anmeldung konnte technisch nicht geprüft werden.',
|
||||||
|
array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password'),
|
||||||
|
'Nextcloud / WebDAV – Anmeldung',
|
||||||
|
$technical.' · Ziel: '.$user_url
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($user_probe['http'] === 401 || $user_probe['http'] === 403)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Nextcloud hat Benutzername oder Passwort abgelehnt.',
|
||||||
|
array('nc_nextcloud_user','nc_nextcloud_password'),
|
||||||
|
'Nextcloud / WebDAV – Anmeldung',
|
||||||
|
'HTTP '.$user_probe['http']
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($user_probe['http'] < 200 || $user_probe['http'] >= 300)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Nextcloud ist erreichbar, aber die Benutzerprüfung wurde vom Server abgelehnt.',
|
||||||
|
array('nc_nextcloud_user','nc_nextcloud_password'),
|
||||||
|
'Nextcloud / WebDAV – Anmeldung',
|
||||||
|
'HTTP '.$user_probe['http'].' · Ziel: '.$user_url
|
||||||
|
);
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_wizard_ocs_data($user_probe['body']);
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Nextcloud antwortet auf die Benutzerprüfung, die Antwort ist aber nicht gültig: '.$e->getMessage(),
|
||||||
|
array('nc_nextcloud_user','nc_nextcloud_password'),
|
||||||
|
'Nextcloud / WebDAV – Anmeldung'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$api_key_id = trim((string)($_POST['nc_connection_api_key_id'] ?? ($credentials['api_key_id'] ?? '')));
|
||||||
|
$submitted_api_secret = trim((string)($_POST['nc_connection_api_key_secret'] ?? ''));
|
||||||
|
$api_key_secret = $submitted_api_secret !== '' ? $submitted_api_secret : trim((string)($credentials['api_key_secret'] ?? ''));
|
||||||
|
if (($api_key_id === '') !== ($api_key_secret === ''))
|
||||||
|
{
|
||||||
|
$missing = $api_key_id === '' ? array('nc_connection_api_key_id') : array('nc_connection_api_key_secret');
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'API-Schlüssel-ID und API-Geheimnis müssen gemeinsam vollständig sein.',
|
||||||
|
$missing,
|
||||||
|
'Piwigo API'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if ($api_key_id !== '')
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_connector_validate_scoped_api($api_key_id, $api_key_secret);
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
'Der Piwigo-API-Zugang konnte nicht bestätigt werden: '.$e->getMessage(),
|
||||||
|
array('nc_connection_api_key_id','nc_connection_api_key_secret'),
|
||||||
|
'Piwigo API'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = bratonien_tools_nc_connector_update_local_friendly();
|
||||||
|
bratonien_tools_nc_edit_json(200, array(
|
||||||
|
'ok'=>true,
|
||||||
|
'message'=>(string)($result['message'] ?? 'Verbindung wurde gespeichert.'),
|
||||||
|
'fields'=>array(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
$message = trim($e->getMessage());
|
||||||
|
if ($message === '') $message = 'Die Verbindung konnte nicht gespeichert werden.';
|
||||||
|
|
||||||
|
$fields = array();
|
||||||
|
$stage = 'Verbindung';
|
||||||
|
$add = function($name) use (&$fields)
|
||||||
|
{
|
||||||
|
if (!in_array($name, $fields, true)) $fields[] = $name;
|
||||||
|
};
|
||||||
|
|
||||||
|
if (stripos($message, 'Name') !== false && stripos($message, 'Datenbankname') === false) $add('connection_name');
|
||||||
|
if (stripos($message, 'Datenbank-Server') !== false) { $add('nc_host'); $stage = 'Legacy-Datenbank'; }
|
||||||
|
if (stripos($message, 'Datenbank-Port') !== false) { $add('nc_port'); $stage = 'Legacy-Datenbank'; }
|
||||||
|
if (stripos($message, 'Datenbankname') !== false) { $add('nc_database'); $stage = 'Legacy-Datenbank'; }
|
||||||
|
if (stripos($message, 'Reader-Benutzer') !== false) { $add('nc_user'); $stage = 'Legacy-Datenbank'; }
|
||||||
|
if (stripos($message, 'Datenbankpasswort') !== false) { $add('nc_db_password'); $stage = 'Legacy-Datenbank'; }
|
||||||
|
if (stripos($message, 'Storage-ID') !== false) { $add('nc_storage_id[]'); $stage = 'Speicherorte'; }
|
||||||
|
if (stripos($message, 'lokaler Pfad') !== false || stripos($message, 'Speicherort') !== false) { $add('nc_local_mount[]'); $stage = 'Speicherorte'; }
|
||||||
|
if (stripos($message, 'Galerieordner') !== false) { $add('nc_gallery_root'); $stage = 'Erweiterte Legacy-Einstellungen'; }
|
||||||
|
if (stripos($message, 'Datenbankansichten') !== false || stripos($message, 'Source-View') !== false) { $add('nc_source_view'); $stage = 'Erweiterte Legacy-Einstellungen'; }
|
||||||
|
if (stripos($message, 'Datenbankansichten') !== false || stripos($message, 'Activity-View') !== false) { $add('nc_activity_view'); $stage = 'Erweiterte Legacy-Einstellungen'; }
|
||||||
|
|
||||||
|
if (stripos($message, 'Nextcloud') !== false)
|
||||||
|
{
|
||||||
|
$stage = 'Nextcloud / WebDAV';
|
||||||
|
if (stripos($message, 'Adresse') !== false) $add('nc_nextcloud_url');
|
||||||
|
if (stripos($message, 'Benutzer') !== false) $add('nc_nextcloud_user');
|
||||||
|
if (stripos($message, 'Passwort') !== false) $add('nc_nextcloud_password');
|
||||||
|
}
|
||||||
|
if (stripos($message, 'API') !== false)
|
||||||
|
{
|
||||||
|
$stage = 'Piwigo API';
|
||||||
|
$add('nc_connection_api_key_id');
|
||||||
|
$add('nc_connection_api_key_secret');
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_edit_fail(
|
||||||
|
$message,
|
||||||
|
$fields,
|
||||||
|
$stage,
|
||||||
|
'Interne Prüfung: '.get_class($e)
|
||||||
|
);
|
||||||
|
}
|
||||||
104
nc-connector-source-picker-start.php
Normal file
104
nc-connector-source-picker-start.php
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
<?php
|
||||||
|
$piwigo_root = realpath(dirname(__DIR__, 2));
|
||||||
|
if ($piwigo_root === false)
|
||||||
|
{
|
||||||
|
http_response_code(500);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
define('PHPWG_ROOT_PATH', rtrim($piwigo_root, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR);
|
||||||
|
include_once(PHPWG_ROOT_PATH.'include/common.inc.php');
|
||||||
|
|
||||||
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
|
header('Cache-Control: no-store, max-age=0');
|
||||||
|
|
||||||
|
function bratonien_tools_nc_source_picker_json($status, array $payload)
|
||||||
|
{
|
||||||
|
http_response_code((int)$status);
|
||||||
|
echo json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
function bratonien_tools_nc_source_picker_fail($message, array $fields = array())
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_json(422, array(
|
||||||
|
'ok'=>false,
|
||||||
|
'message'=>(string)$message,
|
||||||
|
'fields'=>array_values(array_unique($fields)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!defined('BRATONIEN_TOOLS_PATH'))
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_json(404, array('ok'=>false, 'message'=>'Bratonien Tools ist nicht aktiv.', 'fields'=>array()));
|
||||||
|
}
|
||||||
|
if (!function_exists('is_admin') || !is_admin())
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_json(403, array('ok'=>false, 'message'=>'Administratorrechte erforderlich.', 'fields'=>array()));
|
||||||
|
}
|
||||||
|
if (($_SERVER['REQUEST_METHOD'] ?? '') !== 'POST')
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_json(405, array('ok'=>false, 'message'=>'Nur POST ist erlaubt.', 'fields'=>array()));
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
check_pwg_token();
|
||||||
|
require_once(BRATONIEN_TOOLS_PATH.'include/tool_registry.inc.php');
|
||||||
|
|
||||||
|
$id = (int)($_POST['connection_id'] ?? 0);
|
||||||
|
$connection = bratonien_tools_nc_connector_connection($id, true);
|
||||||
|
if (!$connection)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_fail('Die zu bearbeitende Verbindung wurde nicht gefunden.');
|
||||||
|
}
|
||||||
|
if ((string)$connection['adapter'] !== 'local')
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_fail('Die automatische Migrationsauswahl ist nur für die bestehende Legacy-Verbindung vorgesehen.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
|
||||||
|
$credentials = bratonien_tools_nc_connector_scoped_secret($connection);
|
||||||
|
|
||||||
|
$base_url = trim((string)($config['nextcloud_url'] ?? ''));
|
||||||
|
$username = trim((string)($credentials['nextcloud_user'] ?? ''));
|
||||||
|
$password = (string)($credentials['nextcloud_password'] ?? '');
|
||||||
|
|
||||||
|
$missing = array();
|
||||||
|
if ($base_url === '') $missing[] = 'nc_nextcloud_url';
|
||||||
|
if ($username === '') $missing[] = 'nc_nextcloud_user';
|
||||||
|
if ($password === '') $missing[] = 'nc_nextcloud_password';
|
||||||
|
if ($missing)
|
||||||
|
{
|
||||||
|
bratonien_tools_nc_source_picker_fail(
|
||||||
|
'Für die automatische Ordnerauswahl müssen Nextcloud-Adresse, Benutzer und Passwort gespeichert sein.',
|
||||||
|
$missing
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_connector_prepare_webdav_wizard_from_connection($connection, 'migrate');
|
||||||
|
|
||||||
|
$state = bratonien_tools_nc_wizard_state();
|
||||||
|
if ((int)($state['step'] ?? 0) !== 2 || empty($state['scan_ok']) || empty($state['directory_selection_ready']))
|
||||||
|
{
|
||||||
|
$detail = trim((string)($state['technical_error'] ?? ''));
|
||||||
|
bratonien_tools_nc_source_picker_fail(
|
||||||
|
$detail !== '' ? 'Die Nextcloud-Ordner konnten nicht geladen werden: '.$detail : 'Die Nextcloud-Ordner konnten nicht geladen werden.',
|
||||||
|
array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
bratonien_tools_nc_source_picker_json(200, array(
|
||||||
|
'ok'=>true,
|
||||||
|
'message'=>'Nextcloud-Ordner wurden geladen. Die Auswahl wird geöffnet.',
|
||||||
|
'fields'=>array(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
catch (Throwable $e)
|
||||||
|
{
|
||||||
|
$message = trim($e->getMessage());
|
||||||
|
if ($message === '') $message = 'Die Nextcloud-Ordnerauswahl konnte nicht vorbereitet werden.';
|
||||||
|
bratonien_tools_nc_source_picker_fail(
|
||||||
|
$message,
|
||||||
|
array('nc_nextcloud_url','nc_nextcloud_user','nc_nextcloud_password')
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -36,6 +36,11 @@ $latest = array(
|
|||||||
'api'=>array('state'=>'not_run','message'=>''),
|
'api'=>array('state'=>'not_run','message'=>''),
|
||||||
'fallback'=>array('state'=>'not_run','message'=>''),
|
'fallback'=>array('state'=>'not_run','message'=>''),
|
||||||
'error_detail'=>'',
|
'error_detail'=>'',
|
||||||
|
'route'=>'',
|
||||||
|
'route_label'=>'Noch kein Datenweg erfasst',
|
||||||
|
'route_timestamp'=>0,
|
||||||
|
'route_time_label'=>'Nicht verfügbar',
|
||||||
|
'route_detail'=>'',
|
||||||
);
|
);
|
||||||
|
|
||||||
if (is_dir($dir))
|
if (is_dir($dir))
|
||||||
@@ -57,6 +62,54 @@ if (is_dir($dir))
|
|||||||
$latest['connection_file'] = basename($file);
|
$latest['connection_file'] = basename($file);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$route_file = $dir.'/route-status.json';
|
||||||
|
if (is_readable($route_file))
|
||||||
|
{
|
||||||
|
$route = json_decode((string)@file_get_contents($route_file), true);
|
||||||
|
if (is_array($route))
|
||||||
|
{
|
||||||
|
$route_name = (string)($route['route'] ?? '');
|
||||||
|
$route_timestamp = (int)($route['timestamp'] ?? 0);
|
||||||
|
$route_label = (string)($route['label'] ?? '');
|
||||||
|
|
||||||
|
if ($route_name === 'webdav')
|
||||||
|
{
|
||||||
|
$route_label = 'WEBDAV PRIMÄR';
|
||||||
|
}
|
||||||
|
elseif ($route_name === 'legacy_fallback')
|
||||||
|
{
|
||||||
|
$route_label = 'LEGACY-FALLBACK AKTIV';
|
||||||
|
}
|
||||||
|
elseif ($route_name === 'failed')
|
||||||
|
{
|
||||||
|
$route_label = 'FEHLER - KEIN ERFOLGREICHER DATENWEG';
|
||||||
|
}
|
||||||
|
elseif ($route_label === '')
|
||||||
|
{
|
||||||
|
$route_label = 'UNBEKANNTER DATENWEG';
|
||||||
|
}
|
||||||
|
|
||||||
|
$route_detail = trim((string)($route['detail'] ?? ''));
|
||||||
|
$latest['route'] = $route_name;
|
||||||
|
$latest['route_label'] = $route_label;
|
||||||
|
$latest['route_timestamp'] = $route_timestamp;
|
||||||
|
$latest['route_time_label'] = $route_timestamp > 0 ? date('d.m.Y H:i:s', $route_timestamp) : 'Nicht verfügbar';
|
||||||
|
$latest['route_detail'] = $route_detail;
|
||||||
|
|
||||||
|
$base_message = trim((string)($latest['message'] ?? ''));
|
||||||
|
$message_parts = array($route_label);
|
||||||
|
if ($route_name !== 'webdav' && $route_detail !== '')
|
||||||
|
{
|
||||||
|
$message_parts[] = $route_detail;
|
||||||
|
}
|
||||||
|
if ($base_message !== '')
|
||||||
|
{
|
||||||
|
$message_parts[] = $base_message;
|
||||||
|
}
|
||||||
|
$latest['message'] = implode(' · ', $message_parts);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((int)$latest['timestamp'] > 0)
|
if ((int)$latest['timestamp'] > 0)
|
||||||
|
|||||||
@@ -134,6 +134,17 @@ try
|
|||||||
if ($baseUrl === '') fail_webdav_reconcile('Nextcloud-Adresse fehlt.');
|
if ($baseUrl === '') fail_webdav_reconcile('Nextcloud-Adresse fehlt.');
|
||||||
if (!$roots) fail_webdav_reconcile('Keine WebDAV-Wurzeln gespeichert.');
|
if (!$roots) fail_webdav_reconcile('Keine WebDAV-Wurzeln gespeichert.');
|
||||||
|
|
||||||
|
$migration = isset($config['migration']) && is_array($config['migration']) ? $config['migration'] : array();
|
||||||
|
$legacyFallbackId = 0;
|
||||||
|
if ((string)($migration['role'] ?? '') === 'webdav-primary-candidate')
|
||||||
|
{
|
||||||
|
$legacyFallbackId = (int)($migration['legacy_fallback_connection_id'] ?? 0);
|
||||||
|
if ($legacyFallbackId < 1 || $legacyFallbackId === $id)
|
||||||
|
{
|
||||||
|
fail_webdav_reconcile('Die gespeicherte Migrationszuordnung zur Legacy-Verbindung ist ungueltig.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$credentials = decrypt_webdav_credentials((string)$row['secret_blob'], $hexKey);
|
$credentials = decrypt_webdav_credentials((string)$row['secret_blob'], $hexKey);
|
||||||
$user = trim($credentials['nextcloud_user']);
|
$user = trim($credentials['nextcloud_user']);
|
||||||
$password = $credentials['nextcloud_password'];
|
$password = $credentials['nextcloud_password'];
|
||||||
@@ -165,7 +176,6 @@ try
|
|||||||
if (!is_dir($galleryRoot) && !mkdir($galleryRoot, 0755, true)) fail_webdav_reconcile('WebDAV-Galeriebereich konnte nicht angelegt werden.');
|
if (!is_dir($galleryRoot) && !mkdir($galleryRoot, 0755, true)) fail_webdav_reconcile('WebDAV-Galeriebereich konnte nicht angelegt werden.');
|
||||||
@chmod($galleryRoot, 0755);
|
@chmod($galleryRoot, 0755);
|
||||||
|
|
||||||
// Alte technische Wrapper unter ./galleries duerfen nicht als Piwigo-Alben auftauchen.
|
|
||||||
webdav_remove_generated_tree($legacyDefault, $legacyGalleryRoot);
|
webdav_remove_generated_tree($legacyDefault, $legacyGalleryRoot);
|
||||||
|
|
||||||
$sourceDir = $publicSourceRoot.'/connection-'.$id;
|
$sourceDir = $publicSourceRoot.'/connection-'.$id;
|
||||||
@@ -189,8 +199,9 @@ try
|
|||||||
{
|
{
|
||||||
$path = trim((string)($root['webdav_path'] ?? ''), '/');
|
$path = trim((string)($root['webdav_path'] ?? ''), '/');
|
||||||
$display = trim((string)($root['display_name'] ?? ''));
|
$display = trim((string)($root['display_name'] ?? ''));
|
||||||
if ($path === '' || $display === '' || preg_match('/[\t\r\n]/', $path.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
|
$runtimePath = $path === '' ? '/' : $path;
|
||||||
$rootLines[] = $path."\t".$display;
|
if ($display === '' || preg_match('/[\t\r\n]/', $runtimePath.$display)) fail_webdav_reconcile('Eine gespeicherte WebDAV-Wurzel ist ungueltig.');
|
||||||
|
$rootLines[] = $runtimePath."\t".$display;
|
||||||
}
|
}
|
||||||
file_put_contents($rootsPath, implode("\n", $rootLines)."\n", LOCK_EX);
|
file_put_contents($rootsPath, implode("\n", $rootLines)."\n", LOCK_EX);
|
||||||
@chmod($rootsPath, 0600);
|
@chmod($rootsPath, 0600);
|
||||||
@@ -198,6 +209,7 @@ try
|
|||||||
$lines = array(
|
$lines = array(
|
||||||
'PIWIGO_ROOT='.webdav_shell_value($piwigoRoot),
|
'PIWIGO_ROOT='.webdav_shell_value($piwigoRoot),
|
||||||
'CONNECTION_ID='.$id,
|
'CONNECTION_ID='.$id,
|
||||||
|
'MIGRATION_LEGACY_CONNECTION_ID='.$legacyFallbackId,
|
||||||
'SOURCE_MODE=webdav-placeholder',
|
'SOURCE_MODE=webdav-placeholder',
|
||||||
'WEBDAV_BASE_URL='.webdav_shell_value($baseUrl),
|
'WEBDAV_BASE_URL='.webdav_shell_value($baseUrl),
|
||||||
'WEBDAV_USER='.webdav_shell_value($user),
|
'WEBDAV_USER='.webdav_shell_value($user),
|
||||||
@@ -223,13 +235,15 @@ try
|
|||||||
'mode'=>'parallel-webdav',
|
'mode'=>'parallel-webdav',
|
||||||
'config'=>$configPath,
|
'config'=>$configPath,
|
||||||
'piwigo_sync_enabled'=>true,
|
'piwigo_sync_enabled'=>true,
|
||||||
|
'legacy_fallback_connection_id'=>$legacyFallbackId,
|
||||||
'reconciled_at'=>date('Y-m-d H:i:s'),
|
'reconciled_at'=>date('Y-m-d H:i:s'),
|
||||||
);
|
);
|
||||||
$json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
$json = json_encode($config, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
|
||||||
if (is_string($json))
|
if (!is_string($json)) fail_webdav_reconcile('WebDAV-Runtime-Konfiguration konnte nicht serialisiert werden.');
|
||||||
|
$escaped = $db->real_escape_string($json);
|
||||||
|
if (!$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} AND adapter='remote' LIMIT 1"))
|
||||||
{
|
{
|
||||||
$escaped = $db->real_escape_string($json);
|
fail_webdav_reconcile('WebDAV-Runtime-Status konnte nicht gespeichert werden: '.$db->error);
|
||||||
$db->query("UPDATE `{$table}` SET config_json='{$escaped}' WHERE id={$id} LIMIT 1");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Throwable $e)
|
catch (Throwable $e)
|
||||||
|
|||||||
@@ -5,20 +5,120 @@ CONFIG_DIR="/etc/bratonien-tools/nc-connector"
|
|||||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
shopt -s nullglob
|
shopt -s nullglob
|
||||||
|
|
||||||
|
declare -A webdav_success_for_legacy=()
|
||||||
|
declare -A webdav_failure_for_legacy=()
|
||||||
|
declare -A legacy_seen=()
|
||||||
|
|
||||||
|
read_config_value() {
|
||||||
|
local key="$1"
|
||||||
|
local file="$2"
|
||||||
|
local value
|
||||||
|
value="$(sed -n "s/^${key}=//p" "$file" | tail -n 1)"
|
||||||
|
value="${value%\"}"
|
||||||
|
value="${value#\"}"
|
||||||
|
value="${value%\'}"
|
||||||
|
value="${value#\'}"
|
||||||
|
printf '%s' "$value"
|
||||||
|
}
|
||||||
|
|
||||||
|
numeric_connection_id() {
|
||||||
|
local value="${1:-}"
|
||||||
|
if [[ "$value" =~ ^[0-9]+$ ]]; then
|
||||||
|
printf '%s' "$value"
|
||||||
|
else
|
||||||
|
printf '0'
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
compact_text() {
|
||||||
|
printf '%s\n' "$1" | tail -n 20 | tr '\n' ' ' | sed 's/[[:space:]]\+/ /g; s/^[[:space:]]//; s/[[:space:]]$//'
|
||||||
|
}
|
||||||
|
|
||||||
|
read_webdav_failure_detail() {
|
||||||
|
local config="$1"
|
||||||
|
local captured_output="${2:-}"
|
||||||
|
local connection_id piwigo_root status_file status_detail
|
||||||
|
|
||||||
|
connection_id="$(read_config_value CONNECTION_ID "$config")"
|
||||||
|
piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
|
||||||
|
[[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
|
||||||
|
|
||||||
|
status_detail=""
|
||||||
|
if [[ -n "$connection_id" ]]; then
|
||||||
|
status_file="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status/connection-${connection_id}.json"
|
||||||
|
if [[ -r "$status_file" ]]; then
|
||||||
|
status_detail="$(php -r '
|
||||||
|
$file = $argv[1];
|
||||||
|
$data = json_decode((string)@file_get_contents($file), true);
|
||||||
|
if (!is_array($data)) exit(0);
|
||||||
|
$message = trim((string)($data["message"] ?? ""));
|
||||||
|
$detail = trim((string)($data["error_detail"] ?? ""));
|
||||||
|
$parts = array();
|
||||||
|
if ($message !== "") $parts[] = $message;
|
||||||
|
if ($detail !== "") $parts[] = $detail;
|
||||||
|
if ($parts) {
|
||||||
|
$text = preg_replace("/\\s+/u", " ", implode(" - ", $parts));
|
||||||
|
echo trim((string)$text);
|
||||||
|
}
|
||||||
|
' "$status_file")"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$captured_output" ]]; then
|
||||||
|
captured_output="$(compact_text "$captured_output")"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$status_detail" && -n "$captured_output" ]]; then
|
||||||
|
printf '%s' "$status_detail | Prozessausgabe: $captured_output"
|
||||||
|
elif [[ -n "$status_detail" ]]; then
|
||||||
|
printf '%s' "$status_detail"
|
||||||
|
elif [[ -n "$captured_output" ]]; then
|
||||||
|
printf '%s' "$captured_output"
|
||||||
|
elif [[ -z "$connection_id" ]]; then
|
||||||
|
printf '%s' 'WebDAV-Prozess wurde gestartet, aber die Verbindungs-ID fehlt in der Runtime-Konfiguration.'
|
||||||
|
else
|
||||||
|
printf '%s' "WebDAV-Prozess fuer Verbindung ${connection_id} endete mit Fehler, lieferte aber weder Statusdatei noch Prozessausgabe."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
write_route_status() {
|
||||||
|
local route="$1"
|
||||||
|
local label="$2"
|
||||||
|
local detail="$3"
|
||||||
|
local fallback_used="$4"
|
||||||
|
local success="$5"
|
||||||
|
|
||||||
|
[[ -n "${ROUTE_STATUS_FILE:-}" ]] || return 0
|
||||||
|
mkdir -p -- "$(dirname -- "$ROUTE_STATUS_FILE")"
|
||||||
|
|
||||||
|
php -r '
|
||||||
|
$payload = array(
|
||||||
|
"timestamp" => time(),
|
||||||
|
"route" => (string)$argv[2],
|
||||||
|
"label" => (string)$argv[3],
|
||||||
|
"detail" => (string)$argv[4],
|
||||||
|
"fallback_used" => $argv[5] === "1",
|
||||||
|
"success" => $argv[6] === "1"
|
||||||
|
);
|
||||||
|
$json = json_encode($payload, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT);
|
||||||
|
if (!is_string($json) || file_put_contents($argv[1], $json.PHP_EOL, LOCK_EX) === false) {
|
||||||
|
fwrite(STDERR, "Route-Status konnte nicht geschrieben werden.\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
@chmod($argv[1], 0644);
|
||||||
|
' "$ROUTE_STATUS_FILE" "$route" "$label" "$detail" "$fallback_used" "$success"
|
||||||
|
}
|
||||||
|
|
||||||
if ! php "$SCRIPT_DIR/reconcile.php"; then
|
if ! php "$SCRIPT_DIR/reconcile.php"; then
|
||||||
echo "NC Connector: gespeicherte lokale Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
|
echo "NC Connector: gespeicherte lokale Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! php "$SCRIPT_DIR/reconcile-webdav.php"; then
|
if ! php "$SCRIPT_DIR/reconcile-webdav.php"; then
|
||||||
echo "NC Connector: WebDAV-Testverbindungen konnten nicht mit der parallelen Runtime abgeglichen werden." >&2
|
echo "NC Connector: WebDAV-Verbindungen konnten nicht mit der Runtime abgeglichen werden." >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Nach dem Reconcile kennt Piwigo alle noch aktiven WebDAV-Verbindungen. Jetzt
|
|
||||||
# werden Sites, Alben, Bilddatensaetze und Derivate geloeschter Verbindungen
|
|
||||||
# entfernt. Das erfasst auch Verbindungen, die bereits vor diesem Update
|
|
||||||
# geloescht wurden.
|
|
||||||
if ! php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"; then
|
if ! php "$SCRIPT_DIR/cleanup-webdav-piwigo.php"; then
|
||||||
echo "NC Connector: Piwigo-Inhalte geloeschter WebDAV-Verbindungen konnten nicht bereinigt werden." >&2
|
echo "NC Connector: Piwigo-Inhalte geloeschter WebDAV-Verbindungen konnten nicht bereinigt werden." >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -37,37 +137,85 @@ if [[ ${#configs[@]} -eq 0 && ${#webdav_configs[@]} -eq 0 ]]; then
|
|||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
result=0
|
route_piwigo_root=""
|
||||||
|
for candidate in "${webdav_configs[@]}" "${configs[@]}"; do
|
||||||
|
[[ -f "$candidate" ]] || continue
|
||||||
|
route_piwigo_root="$(read_config_value PIWIGO_ROOT "$candidate")"
|
||||||
|
[[ -n "$route_piwigo_root" ]] && break
|
||||||
|
done
|
||||||
|
[[ -n "$route_piwigo_root" ]] || route_piwigo_root="/var/www/piwigo"
|
||||||
|
ROUTE_STATUS_FILE="${route_piwigo_root%/}/_data/bratonien-tools/nc-connector-status/route-status.json"
|
||||||
|
|
||||||
|
webdav_success_count=0
|
||||||
|
webdav_failure_count=0
|
||||||
|
legacy_run_count=0
|
||||||
|
legacy_failure_count=0
|
||||||
|
fallback_used=0
|
||||||
|
unpaired_webdav_failure=0
|
||||||
|
summary_parts=()
|
||||||
|
|
||||||
# WebDAV zuerst: Der parallele Shadow Tree muss bereits vollständig stehen,
|
|
||||||
# bevor der weiterhin produktive lokale Weg seine normale Piwigo-
|
|
||||||
# Dateisynchronisierung ausführt. So wird der neue Baum im selben Minutenlauf
|
|
||||||
# sichtbar, ohne dass der WebDAV-Zweig selbst eine zweite globale Piwigo-
|
|
||||||
# Synchronisierung startet.
|
|
||||||
for config in "${webdav_configs[@]}"; do
|
for config in "${webdav_configs[@]}"; do
|
||||||
name="$(basename "$config")"
|
name="$(basename "$config")"
|
||||||
echo "NC Connector WebDAV parallel: $name"
|
connection_id="$(numeric_connection_id "$(read_config_value CONNECTION_ID "$config")")"
|
||||||
if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh"; then
|
legacy_id="$(numeric_connection_id "$(read_config_value MIGRATION_LEGACY_CONNECTION_ID "$config")")"
|
||||||
result=1
|
|
||||||
|
if [[ "$connection_id" -lt 1 ]]; then
|
||||||
|
echo "NC Connector: $name besitzt keine gueltige WebDAV-Verbindungs-ID." >&2
|
||||||
|
webdav_failure_count=$((webdav_failure_count + 1))
|
||||||
|
unpaired_webdav_failure=1
|
||||||
|
summary_parts+=("$name: ungueltige Verbindungs-ID")
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "NC Connector WebDAV #$connection_id: $name"
|
||||||
|
webdav_output=""
|
||||||
|
if webdav_output="$(env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync-webdav.sh" 2>&1)"; then
|
||||||
|
webdav_success_count=$((webdav_success_count + 1))
|
||||||
|
[[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output"
|
||||||
|
if [[ "$legacy_id" -gt 0 ]]; then
|
||||||
|
webdav_success_for_legacy["$legacy_id"]="$connection_id"
|
||||||
|
summary_parts+=("WebDAV #$connection_id erfolgreich; Legacy #$legacy_id uebersprungen")
|
||||||
|
else
|
||||||
|
summary_parts+=("WebDAV #$connection_id erfolgreich")
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
webdav_exit=$?
|
||||||
|
webdav_failure_count=$((webdav_failure_count + 1))
|
||||||
|
[[ -z "$webdav_output" ]] || printf '%s\n' "$webdav_output" >&2
|
||||||
|
webdav_failure_detail="$(read_webdav_failure_detail "$config" "$webdav_output")"
|
||||||
|
webdav_failure_detail="Exit-Code ${webdav_exit}: ${webdav_failure_detail}"
|
||||||
|
echo "NC Connector: WebDAV #$connection_id fehlgeschlagen: $webdav_failure_detail" >&2
|
||||||
|
|
||||||
|
if [[ "$legacy_id" -gt 0 ]]; then
|
||||||
|
webdav_failure_for_legacy["$legacy_id"]="$webdav_failure_detail"
|
||||||
|
echo "NC Connector: Nur Legacy-Verbindung #$legacy_id ist fuer diesen WebDAV-Lauf als Fallback vorgesehen." >&2
|
||||||
|
else
|
||||||
|
unpaired_webdav_failure=1
|
||||||
|
summary_parts+=("WebDAV #$connection_id fehlgeschlagen ohne Legacy-Fallback")
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for config in "${configs[@]}"; do
|
for config in "${configs[@]}"; do
|
||||||
name="$(basename "$config")"
|
name="$(basename "$config")"
|
||||||
connection_id=""
|
connection_id="0"
|
||||||
if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
|
if [[ "$name" =~ ^connection-([0-9]+)\.conf$ ]]; then
|
||||||
connection_id="${BASH_REMATCH[1]}"
|
connection_id="${BASH_REMATCH[1]}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
piwigo_root="$(sed -n 's/^PIWIGO_ROOT=//p' "$config" | tail -n 1)"
|
if [[ "$connection_id" -lt 1 ]]; then
|
||||||
piwigo_root="${piwigo_root%\"}"
|
echo "NC Connector: $name besitzt keine gueltige Legacy-Verbindungs-ID." >&2
|
||||||
piwigo_root="${piwigo_root#\"}"
|
legacy_failure_count=$((legacy_failure_count + 1))
|
||||||
piwigo_root="${piwigo_root%\'}"
|
summary_parts+=("$name: ungueltige Legacy-Verbindungs-ID")
|
||||||
piwigo_root="${piwigo_root#\'}"
|
continue
|
||||||
|
fi
|
||||||
|
legacy_seen["$connection_id"]=1
|
||||||
|
|
||||||
|
piwigo_root="$(read_config_value PIWIGO_ROOT "$config")"
|
||||||
[[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
|
[[ -n "$piwigo_root" ]] || piwigo_root="/var/www/piwigo"
|
||||||
tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
|
tombstone_dir="${piwigo_root%/}/_data/bratonien-tools/nc-connector-status"
|
||||||
|
|
||||||
if [[ -n "$connection_id" && -f "$tombstone_dir/deleted-$connection_id" ]]; then
|
if [[ -f "$tombstone_dir/deleted-$connection_id" ]]; then
|
||||||
echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
|
echo "NC Connector: Verbindung $connection_id wurde geloescht; Laufzeitdateien werden entfernt."
|
||||||
rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
|
rm -f -- "$CONFIG_DIR/connection-$connection_id.conf" \
|
||||||
"$CONFIG_DIR/connection-$connection_id.db-password" \
|
"$CONFIG_DIR/connection-$connection_id.db-password" \
|
||||||
@@ -78,10 +226,68 @@ for config in "${configs[@]}"; do
|
|||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "NC Connector lokal: $name"
|
if [[ -n "${webdav_success_for_legacy[$connection_id]:-}" ]]; then
|
||||||
if ! env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
|
echo "NC Connector: Legacy #$connection_id wird nicht ausgefuehrt, weil der zugeordnete WebDAV-Nachfolger #${webdav_success_for_legacy[$connection_id]} erfolgreich war."
|
||||||
result=1
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
legacy_run_count=$((legacy_run_count + 1))
|
||||||
|
if [[ -n "${webdav_failure_for_legacy[$connection_id]:-}" ]]; then
|
||||||
|
echo "NC Connector Legacy-Fallback #$connection_id nach WebDAV-Fehler: $name"
|
||||||
|
fallback_used=1
|
||||||
|
else
|
||||||
|
echo "NC Connector Legacy #$connection_id: $name"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if env PIWIGO_CONFIG="$config" bash "$SCRIPT_DIR/sync.sh"; then
|
||||||
|
if [[ -n "${webdav_failure_for_legacy[$connection_id]:-}" ]]; then
|
||||||
|
summary_parts+=("WebDAV fuer Legacy #$connection_id fehlgeschlagen; Legacy-Fallback erfolgreich")
|
||||||
|
else
|
||||||
|
summary_parts+=("Legacy #$connection_id erfolgreich")
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
legacy_failure_count=$((legacy_failure_count + 1))
|
||||||
|
summary_parts+=("Legacy #$connection_id fehlgeschlagen")
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
exit "$result"
|
for legacy_id in "${!webdav_failure_for_legacy[@]}"; do
|
||||||
|
if [[ -z "${legacy_seen[$legacy_id]:-}" ]]; then
|
||||||
|
echo "NC Connector: WebDAV fuer Legacy #$legacy_id ist fehlgeschlagen, aber die zugeordnete Legacy-Runtime fehlt." >&2
|
||||||
|
legacy_failure_count=$((legacy_failure_count + 1))
|
||||||
|
summary_parts+=("Fallback #$legacy_id fehlt")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
summary_detail="$(IFS='; '; printf '%s' "${summary_parts[*]}")"
|
||||||
|
[[ -n "$summary_detail" ]] || summary_detail="Keine Connector-Route wurde ausgefuehrt."
|
||||||
|
|
||||||
|
if [[ "$unpaired_webdav_failure" -eq 0 && "$legacy_failure_count" -eq 0 ]]; then
|
||||||
|
if [[ "$fallback_used" -eq 1 ]]; then
|
||||||
|
route="mixed_fallback"
|
||||||
|
label="MIGRATION - FALLBACK AKTIV"
|
||||||
|
elif [[ "$webdav_success_count" -gt 0 && "$legacy_run_count" -gt 0 ]]; then
|
||||||
|
route="mixed"
|
||||||
|
label="WebDAV + Legacy"
|
||||||
|
elif [[ "$webdav_success_count" -gt 0 ]]; then
|
||||||
|
route="webdav"
|
||||||
|
label="WebDAV"
|
||||||
|
else
|
||||||
|
route="legacy"
|
||||||
|
label="Legacy"
|
||||||
|
fi
|
||||||
|
|
||||||
|
write_route_status "$route" "$label" "$summary_detail" "$fallback_used" "1"
|
||||||
|
echo "NC Connector: alle erforderlichen Verbindungen wurden erfolgreich verarbeitet."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
write_route_status \
|
||||||
|
"failed" \
|
||||||
|
"FEHLER - mindestens eine Verbindung" \
|
||||||
|
"$summary_detail" \
|
||||||
|
"$fallback_used" \
|
||||||
|
"0"
|
||||||
|
|
||||||
|
echo "NC Connector: mindestens eine erforderliche Verbindung ist fehlgeschlagen." >&2
|
||||||
|
exit 1
|
||||||
|
|||||||
@@ -9,7 +9,13 @@
|
|||||||
.bratonien-tab-panel { width:100%; max-width:none; margin-left:0 !important; margin-right:0 !important; }
|
.bratonien-tab-panel { width:100%; max-width:none; margin-left:0 !important; margin-right:0 !important; }
|
||||||
.bratonien-tab-panel[hidden] { display:none !important; }
|
.bratonien-tab-panel[hidden] { display:none !important; }
|
||||||
.bratonien-card { margin-left:0; margin-right:0; }
|
.bratonien-card { margin-left:0; margin-right:0; }
|
||||||
@media (max-width:760px) { .bratonien-tabs{gap:5px}.bratonien-tab{border-bottom:1px solid rgba(255,255,255,.16);border-radius:4px;margin-bottom:0;padding:9px 11px} }
|
.bratonien-edit-dialog { width:min(920px,calc(100vw - 3rem)); max-height:88vh; overflow:auto; background:#444; color:inherit; border:1px solid #777; border-radius:4px; padding:0; box-shadow:0 18px 60px rgba(0,0,0,.55); }
|
||||||
|
.bratonien-edit-dialog::backdrop { background:rgba(0,0,0,.55); }
|
||||||
|
.bratonien-edit-dialog__body { padding:1.25rem 1.5rem; }
|
||||||
|
.bratonien-storage-row { display:grid; grid-template-columns:minmax(120px,.7fr) minmax(150px,1fr) minmax(240px,1.5fr) auto; gap:.5rem; align-items:end; margin:.5rem 0; }
|
||||||
|
.bratonien-storage-row label { display:flex; flex-direction:column; gap:.25rem; }
|
||||||
|
.bratonien-storage-row input { width:100%; box-sizing:border-box; }
|
||||||
|
@media (max-width:760px) { .bratonien-tabs{gap:5px}.bratonien-tab{border-bottom:1px solid rgba(255,255,255,.16);border-radius:4px;margin-bottom:0;padding:9px 11px}.bratonien-storage-row{grid-template-columns:1fr} }
|
||||||
</style>
|
</style>
|
||||||
<div id="bratonien-tabs-anchor"></div>
|
<div id="bratonien-tabs-anchor"></div>
|
||||||
<script>
|
<script>
|
||||||
@@ -48,12 +54,31 @@
|
|||||||
var openButton=document.getElementById('bratonien-nc-wizard-open');
|
var openButton=document.getElementById('bratonien-nc-wizard-open');
|
||||||
var closeButton=document.getElementById('bratonien-nc-wizard-close');
|
var closeButton=document.getElementById('bratonien-nc-wizard-close');
|
||||||
var storageKey='bratonienNcWizardOpen';
|
var storageKey='bratonienNcWizardOpen';
|
||||||
|
var modeKey='bratonienNcWizardMode';
|
||||||
var resetBusy=false;
|
var resetBusy=false;
|
||||||
|
|
||||||
function token(){var input=section.querySelector('input[name="pwg_token"]');return input?input.value:'';}
|
function token(){var input=section.querySelector('input[name="pwg_token"]');return input?input.value:'';}
|
||||||
function setOpen(value){try{if(value)sessionStorage.setItem(storageKey,'1');else sessionStorage.removeItem(storageKey);}catch(e){}}
|
function setOpen(value){try{if(value)sessionStorage.setItem(storageKey,'1');else sessionStorage.removeItem(storageKey);}catch(e){}}
|
||||||
|
function mode(){try{return sessionStorage.getItem(modeKey)||'';}catch(e){return '';}}
|
||||||
|
function clearMode(){try{sessionStorage.removeItem(modeKey);}catch(e){}}
|
||||||
|
function applyMode(){
|
||||||
|
if(!dialog)return;
|
||||||
|
var current=mode();
|
||||||
|
var heading=dialog.querySelector('h4');
|
||||||
|
var finish=dialog.querySelector('button[value="nc_connector_wizard_finish"]');
|
||||||
|
if(current==='edit'){
|
||||||
|
if(heading)heading.textContent='Verbindung bearbeiten';
|
||||||
|
if(finish)finish.textContent='Änderungen speichern';
|
||||||
|
}else if(current==='migrate'){
|
||||||
|
if(heading)heading.textContent='Auf WebDAV migrieren';
|
||||||
|
if(finish)finish.textContent='Migration starten';
|
||||||
|
}else{
|
||||||
|
if(heading)heading.textContent='Neue Verbindung';
|
||||||
|
if(finish)finish.textContent='Verbindung anlegen';
|
||||||
|
}
|
||||||
|
}
|
||||||
function showWizard(){
|
function showWizard(){
|
||||||
setOpen(true);
|
setOpen(true);applyMode();
|
||||||
if(!dialog)return;
|
if(!dialog)return;
|
||||||
if(typeof dialog.showModal==='function'&&!dialog.open)dialog.showModal();
|
if(typeof dialog.showModal==='function'&&!dialog.open)dialog.showModal();
|
||||||
else dialog.setAttribute('open','open');
|
else dialog.setAttribute('open','open');
|
||||||
@@ -65,13 +90,13 @@
|
|||||||
return fetch(window.location.href,{method:'POST',credentials:'same-origin',cache:'no-store',headers:{'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'},body:body.toString()});
|
return fetch(window.location.href,{method:'POST',credentials:'same-origin',cache:'no-store',headers:{'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'},body:body.toString()});
|
||||||
}
|
}
|
||||||
function closeAfterReset(){
|
function closeAfterReset(){
|
||||||
if(resetBusy)return;resetBusy=true;setOpen(false);
|
if(resetBusy)return;resetBusy=true;setOpen(false);clearMode();
|
||||||
resetServer().catch(function(){}).finally(function(){resetBusy=false;if(dialog){if(typeof dialog.close==='function'&&dialog.open)dialog.close();else dialog.removeAttribute('open');}});
|
resetServer().catch(function(){}).finally(function(){resetBusy=false;if(dialog){if(typeof dialog.close==='function'&&dialog.open)dialog.close();else dialog.removeAttribute('open');}});
|
||||||
}
|
}
|
||||||
|
|
||||||
if(openButton){
|
if(openButton){
|
||||||
openButton.addEventListener('click',function(event){
|
openButton.addEventListener('click',function(event){
|
||||||
event.preventDefault();event.stopImmediatePropagation();showWizard();
|
event.preventDefault();event.stopImmediatePropagation();clearMode();showWizard();
|
||||||
},true);
|
},true);
|
||||||
}
|
}
|
||||||
if(closeButton){
|
if(closeButton){
|
||||||
@@ -80,18 +105,111 @@
|
|||||||
if(dialog){
|
if(dialog){
|
||||||
dialog.addEventListener('cancel',function(event){event.preventDefault();event.stopImmediatePropagation();closeAfterReset();},true);
|
dialog.addEventListener('cancel',function(event){event.preventDefault();event.stopImmediatePropagation();closeAfterReset();},true);
|
||||||
dialog.addEventListener('click',function(event){if(event.target===dialog){event.preventDefault();event.stopImmediatePropagation();closeAfterReset();}},true);
|
dialog.addEventListener('click',function(event){if(event.target===dialog){event.preventDefault();event.stopImmediatePropagation();closeAfterReset();}},true);
|
||||||
|
|
||||||
// Every wizard POST explicitly preserves the open state before the
|
|
||||||
// browser leaves the page. Validation errors therefore return to the
|
|
||||||
// same wizard step instead of closing/resetting the dialog.
|
|
||||||
[].slice.call(dialog.querySelectorAll('form[data-bratonien-wizard-form]')).forEach(function(form){
|
[].slice.call(dialog.querySelectorAll('form[data-bratonien-wizard-form]')).forEach(function(form){
|
||||||
form.addEventListener('submit',function(){setOpen(true);},true);
|
form.addEventListener('submit',function(event){
|
||||||
|
var submitter=event.submitter;
|
||||||
|
setOpen(true);
|
||||||
|
if(submitter&&submitter.hasAttribute('data-bratonien-wizard-end')){
|
||||||
|
setOpen(false);
|
||||||
|
if(submitter.value==='nc_connector_wizard_reset')clearMode();
|
||||||
|
}
|
||||||
|
},true);
|
||||||
});
|
});
|
||||||
|
|
||||||
try{if(sessionStorage.getItem(storageKey)==='1')showWizard();}catch(e){}
|
try{if(sessionStorage.getItem(storageKey)==='1')showWizard();}catch(e){}
|
||||||
|
applyMode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function initNCConnectionEditing(){
|
||||||
|
var section=document.getElementById('nc-connector');if(!section)return;
|
||||||
|
var modeKey='bratonienNcWizardMode';
|
||||||
|
var pwgTokenInput=section.querySelector('input[name="pwg_token"]');
|
||||||
|
var pwgToken=pwgTokenInput?pwgTokenInput.value:'';
|
||||||
|
|
||||||
|
function setMode(value){try{sessionStorage.setItem(modeKey,value);}catch(e){}}
|
||||||
|
function makePostButton(label,tool,id,modeValue){
|
||||||
|
var form=document.createElement('form');form.method='post';form.style.display='inline';
|
||||||
|
var token=document.createElement('input');token.type='hidden';token.name='pwg_token';token.value=pwgToken;form.appendChild(token);
|
||||||
|
var connection=document.createElement('input');connection.type='hidden';connection.name='connection_id';connection.value=String(id);form.appendChild(connection);
|
||||||
|
var button=document.createElement('button');button.type='submit';button.className='buttonLike';button.name='bratonien_tool';button.value=tool;button.textContent=label;
|
||||||
|
if(modeValue)form.addEventListener('submit',function(){setMode(modeValue);});
|
||||||
|
form.appendChild(button);return form;
|
||||||
|
}
|
||||||
|
function escapeHtml(value){return String(value==null?'':value).replace(/[&<>"']/g,function(c){return {'&':'&','<':'<','>':'>','"':'"',"'":'''}[c];});}
|
||||||
|
function localEditorDialog(){
|
||||||
|
var dialog=document.getElementById('bratonien-nc-local-edit-dialog');
|
||||||
|
if(dialog)return dialog;
|
||||||
|
dialog=document.createElement('dialog');dialog.id='bratonien-nc-local-edit-dialog';dialog.className='bratonien-edit-dialog';
|
||||||
|
dialog.innerHTML='<div class="bratonien-edit-dialog__body"><div style="display:flex;align-items:center;justify-content:space-between;gap:1rem"><div><h4 style="margin:0">Verbindung bearbeiten</h4><p class="bratonien-base-note" style="margin:.35rem 0 0">Bestehende Legacy-Verbindung. Änderungen werden in derselben Verbindung gespeichert.</p></div><button type="button" class="buttonLike" data-local-edit-close>Schließen</button></div><div data-local-edit-content style="margin-top:1rem"></div></div>';
|
||||||
|
document.body.appendChild(dialog);
|
||||||
|
dialog.querySelector('[data-local-edit-close]').addEventListener('click',function(){dialog.close();});
|
||||||
|
dialog.addEventListener('click',function(event){if(event.target===dialog)dialog.close();});
|
||||||
|
return dialog;
|
||||||
|
}
|
||||||
|
function storageRow(storage){
|
||||||
|
return '<div class="bratonien-storage-row" data-storage-row>'+
|
||||||
|
'<label>Storage-ID<input name="nc_storage_id[]" value="'+escapeHtml(storage.storage_id||'')+'" required></label>'+
|
||||||
|
'<label>Quellordner<input name="nc_source_prefix[]" value="'+escapeHtml(storage.source_prefix||'')+'" placeholder="optional"></label>'+
|
||||||
|
'<label>Lokaler Speicherpfad<input name="nc_local_mount[]" value="'+escapeHtml(storage.local_mount||'')+'" required></label>'+
|
||||||
|
'<button type="button" class="buttonLike" data-remove-storage>Entfernen</button></div>';
|
||||||
|
}
|
||||||
|
function openLocalEditor(id){
|
||||||
|
var dialog=localEditorDialog();
|
||||||
|
var content=dialog.querySelector('[data-local-edit-content]');
|
||||||
|
content.innerHTML='<p class="bratonien-base-note">Verbindung wird geladen …</p>';
|
||||||
|
if(typeof dialog.showModal==='function')dialog.showModal();else dialog.setAttribute('open','open');
|
||||||
|
fetch('plugins/bratonien_tools/nc-connector-edit-data.php?connection_id='+encodeURIComponent(id)+'&_='+Date.now(),{credentials:'same-origin',cache:'no-store',headers:{'Accept':'application/json'}})
|
||||||
|
.then(function(response){return response.json().then(function(data){if(!response.ok)throw new Error(data.error||('HTTP '+response.status));return data;});})
|
||||||
|
.then(function(data){
|
||||||
|
if(data.adapter!=='local')throw new Error('Diese Verbindung ist keine Legacy-Verbindung.');
|
||||||
|
var legacy=data.legacy||{};var storages=Array.isArray(legacy.storages)?legacy.storages:[];
|
||||||
|
var rows=storages.map(storageRow).join('');
|
||||||
|
if(!rows)rows=storageRow({});
|
||||||
|
content.innerHTML='<form method="post" data-local-edit-form>'+
|
||||||
|
'<input type="hidden" name="pwg_token" value="'+escapeHtml(pwgToken)+'">'+
|
||||||
|
'<input type="hidden" name="connection_id" value="'+escapeHtml(data.id)+'">'+
|
||||||
|
'<div class="bratonien-form-grid">'+
|
||||||
|
'<label class="bratonien-label">Name</label><input name="connection_name" value="'+escapeHtml(data.name)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Datenbank-Server</label><input name="nc_host" value="'+escapeHtml(legacy.host)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Port</label><input name="nc_port" type="number" min="1" max="65535" value="'+escapeHtml(legacy.port||5432)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Datenbank</label><input name="nc_database" value="'+escapeHtml(legacy.database)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Reader-Benutzer</label><input name="nc_user" value="'+escapeHtml(legacy.user)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Reader-Passwort</label><input name="nc_db_password" type="password" autocomplete="new-password" placeholder="leer = unverändert">'+
|
||||||
|
'</div>'+
|
||||||
|
'<h5 style="margin-top:1rem">Speicherorte</h5><p class="bratonien-base-note">Jeder Speicherort wird einzeln bearbeitet. Es ist kein Pipe-/Textformat erforderlich.</p><div data-storage-list>'+rows+'</div><button type="button" class="buttonLike" data-add-storage>Speicherort hinzufügen</button>'+
|
||||||
|
'<details style="margin-top:1rem"><summary>Erweiterte Legacy-Einstellungen</summary><div class="bratonien-form-grid" style="margin-top:.75rem">'+
|
||||||
|
'<label class="bratonien-label">Source-View</label><input name="nc_source_view" value="'+escapeHtml(legacy.source_view)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Activity-View</label><input name="nc_activity_view" value="'+escapeHtml(legacy.activity_view)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Piwigo-Galerieordner</label><input name="nc_gallery_root" value="'+escapeHtml(legacy.gallery_root)+'" required>'+
|
||||||
|
'<label class="bratonien-label">Ruhezeit (Sek.)</label><input name="nc_quiet_seconds" type="number" min="0" value="'+escapeHtml(legacy.quiet_seconds)+'">'+
|
||||||
|
'<label class="bratonien-label">Maximale Wartezeit (Sek.)</label><input name="nc_max_wait_seconds" type="number" min="60" value="'+escapeHtml(legacy.max_wait_seconds)+'">'+
|
||||||
|
'<label class="bratonien-label">Vollprüfung nach (Sek.)</label><input name="nc_full_sync_seconds" type="number" min="300" value="'+escapeHtml(legacy.full_sync_seconds)+'">'+
|
||||||
|
'</div></details>'+
|
||||||
|
'<div class="bratonien-actions" style="margin-top:1rem"><button class="buttonLike" type="submit" name="bratonien_tool" value="nc_connector_update_local">Änderungen speichern</button><button class="buttonLike" type="button" data-local-edit-cancel>Abbrechen</button></div></form>';
|
||||||
|
var form=content.querySelector('[data-local-edit-form]');
|
||||||
|
form.querySelector('[data-local-edit-cancel]').addEventListener('click',function(){dialog.close();});
|
||||||
|
form.querySelector('[data-add-storage]').addEventListener('click',function(){form.querySelector('[data-storage-list]').insertAdjacentHTML('beforeend',storageRow({}));});
|
||||||
|
form.addEventListener('click',function(event){var remove=event.target.closest('[data-remove-storage]');if(remove){var row=remove.closest('[data-storage-row]');if(row)row.remove();}});
|
||||||
|
})
|
||||||
|
.catch(function(error){content.innerHTML='<p class="bratonien-main-cache__warning"><strong>Bearbeiten nicht möglich:</strong> '+escapeHtml(error.message||String(error))+'</p>';});
|
||||||
|
}
|
||||||
|
|
||||||
|
[].slice.call(section.querySelectorAll('button[value="nc_connector_edit_start"]')).forEach(function(button){var form=button.closest('form');if(form)form.remove();});
|
||||||
|
|
||||||
|
[].slice.call(section.querySelectorAll('button[value="nc_connector_delete"]')).forEach(function(deleteButton){
|
||||||
|
var deleteForm=deleteButton.closest('form');var card=deleteButton.closest('details');if(!deleteForm||!card)return;
|
||||||
|
var idInput=deleteForm.querySelector('input[name="connection_id"]');if(!idInput)return;var id=idInput.value;
|
||||||
|
var actions=deleteForm.parentElement;if(!actions)return;
|
||||||
|
var text=card.textContent||'';var isLocal=text.indexOf('bestehende Legacy-Konfiguration')!==-1;
|
||||||
|
if(isLocal){
|
||||||
|
var edit=document.createElement('button');edit.type='button';edit.className='buttonLike';edit.textContent='Bearbeiten';edit.addEventListener('click',function(){openLocalEditor(id);});actions.insertBefore(edit,deleteForm);
|
||||||
|
actions.insertBefore(makePostButton('Auf WebDAV migrieren','nc_connector_migrate_start',id,'migrate'),deleteForm);
|
||||||
|
}else{
|
||||||
|
actions.insertBefore(makePostButton('Bearbeiten','nc_connector_edit_start',id,'edit'),deleteForm);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
function initNCConnectorPolling(){
|
function initNCConnectorPolling(){
|
||||||
var section=document.getElementById('nc-connector');if(!section)return;
|
var section=document.getElementById('nc-connector');if(!section)return;
|
||||||
var endpoint='plugins/bratonien_tools/nc-connector-status.php';
|
var endpoint='plugins/bratonien_tools/nc-connector-status.php';
|
||||||
@@ -144,7 +262,7 @@
|
|||||||
poll();schedule();
|
poll();schedule();
|
||||||
}
|
}
|
||||||
|
|
||||||
function initAll(){initBratonienTabs();initNCWizardLifecycle();initNCConnectorPolling();}
|
function initAll(){initBratonienTabs();initNCWizardLifecycle();initNCConnectionEditing();initNCConnectorPolling();}
|
||||||
if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',initAll);else initAll();
|
if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',initAll);else initAll();
|
||||||
})();
|
})();
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user