0.9.6.14 bump version for adapter-safe edit actions

0.9.6.13: Nextcloud-Protokoll automatisch erkennen

js/nc_connector_edit_v2.js

@@ -19,7 +19,7 @@
 
     function escapeHtml(value) {
       return String(value == null ? '' : value).replace(/[&<>"']/g, function (c) {
-        return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#039;'}[c];
+        return {'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot',"'":'&#039;'}[c];
       });
     }
 
@@ -239,13 +239,14 @@
       });
     }
 
-    function rebuildLocalActions(deleteForm, id) {
+    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"]');
-        if (migrate) form.remove();
+        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();
@@ -265,7 +266,8 @@
       info.textContent = 'WebDAV-Migration wird geprüft …';
       actions.insertBefore(info, deleteForm);
 
-      loadConnection(id).then(function (data) {
+      var dataPromise = connectionData ? Promise.resolve(connectionData) : loadConnection(id);
+      dataPromise.then(function (data) {
         var webdav = data.webdav || {};
         if (webdav.migration_ready) {
           info.remove();
@@ -279,15 +281,44 @@
       });
     }
 
+    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');
-      var card = deleteButton.closest('details');
-      if (!deleteForm || !card) return;
+      if (!deleteForm) return;
       var idInput = deleteForm.querySelector('input[name="connection_id"]');
       if (!idInput) return;
-      var text = card.textContent || '';
-      var isLocal = text.indexOf('bestehende Legacy-Konfiguration') !== -1;
-      if (isLocal) rebuildLocalActions(deleteForm, idInput.value);
+      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);
+      });
     });
   });
 })();

main.inc.php

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

nc-connector-edit-save.php

@@ -99,16 +99,16 @@ try
   $config = isset($connection['config']) && is_array($connection['config']) ? $connection['config'] : array();
   $credentials = bratonien_tools_nc_connector_scoped_secret($connection);
 
-  $nextcloud_url = trim((string)($_POST['nc_nextcloud_url'] ?? ($config['nextcloud_url'] ?? '')));
+  $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_url !== '' || $nextcloud_user !== '' || $nextcloud_password !== '';
+  $has_any_nextcloud = $nextcloud_input !== '' || $nextcloud_user !== '' || $nextcloud_password !== '';
   if ($has_any_nextcloud)
   {
     $missing = array();
-    if ($nextcloud_url === '') $missing[] = 'nc_nextcloud_url';
+    if ($nextcloud_input === '') $missing[] = 'nc_nextcloud_url';
     if ($nextcloud_user === '') $missing[] = 'nc_nextcloud_user';
     if ($nextcloud_password === '') $missing[] = 'nc_nextcloud_password';
     if ($missing)
@@ -122,47 +122,68 @@ try
 
     try
     {
-      $nextcloud_url = bratonien_tools_nc_wizard_normalize_url($nextcloud_url);
+      $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');
     }
 
-    $status_url = $nextcloud_url.'/status.php';
-    $probe = bratonien_tools_nc_edit_probe($status_url);
-    if (!$probe['ok'])
+    $nextcloud_url = '';
+    $last_probe = null;
+    $last_status_url = '';
+    foreach ($candidate_urls as $candidate_url)
     {
-      $technical = $probe['errno'] >= 0
-        ? 'cURL '.$probe['errno'].($probe['error'] !== '' ? ': '.$probe['error'] : '')
-        : $probe['error'];
-      bratonien_tools_nc_edit_fail(
-        'Die Nextcloud-Adresse ist vom Piwigo-Server aus nicht erreichbar.',
-        array('nc_nextcloud_url'),
-        'Nextcloud / WebDAV – Erreichbarkeit',
-        $technical.' · Ziel: '.$status_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 ($probe['http'] < 200 || $probe['http'] >= 300)
+
+    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 Nextcloud-Adresse antwortet status.php nicht erfolgreich.',
-        array('nc_nextcloud_url'),
-        'Nextcloud / WebDAV – Erreichbarkeit',
-        'HTTP '.$probe['http'].' · Ziel: '.$status_url
-      );
-    }
-    $status = json_decode($probe['body'], true);
-    if (!is_array($status) || empty($status['installed']))
-    {
-      bratonien_tools_nc_edit_fail(
-        'Die Adresse ist erreichbar, dort wurde aber keine installierte Nextcloud erkannt.',
+        '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',
-        'status.php lieferte keine installierte Nextcloud.'
+        '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'])