Heal every shipped public/.htaccess, not only the 0.7.71 one (#480)

.gitignore

@@ -472,6 +472,7 @@ tests/fixtures/*
 !tests/fixtures/*.csv
 !tests/fixtures/*.tsv
 !tests/fixtures/sru/
+!tests/fixtures/htaccess-history/
 !tests/helpers/
 tests/helpers/*
 !tests/helpers/*.php

app/Support/PluginManager.php

@@ -483,9 +483,21 @@ public function autoRegisterBundledPlugins(): int
                             // that is behind. Each plugin now syncs independently.
                             SecureLogger::error("[PluginManager] onActivate failed during upgrade for $pluginName; version rolled back to $dbVersion, other plugins keep syncing, retry next boot. Error: " . $e->getMessage());
                         }
+                    } else {
+                        $this->syncInactivePluginSchema((int) $row['id'], $pluginName, $pluginMeta);
                     }
-                } elseif ($diskVersion === $dbVersion && (int) ($row['is_active'] ?? 0) === 1) {
-                    // Same disk/DB version, active plugin. Re-run onActivate when
+                } elseif ((int) ($row['is_active'] ?? 0) !== 1) {
+                    // Same version, but the bump may already have been taken by the
+                    // previous release's Updater, which runs this sync with its own
+                    // PluginManager still in memory: an install upgraded from 0.7.16
+                    // arrives here with NCIP at 1.0.5 and prenotazione_id missing.
+                    // This pass runs on every maintenance window (900 s per version
+                    // stamp) and on every getAllPlugins() call (each load of the admin
+                    // plugins page), and the check is read-only until something is
+                    // actually missing.
+                    $this->syncInactivePluginSchema((int) $row['id'], $pluginName, $pluginMeta);
+                } elseif ($diskVersion === $dbVersion) {
+                    // Same disk/DB version, active plugin (the inactive ones took the branch above). Re-run onActivate when
                     // EITHER:
                     //  (a) hooks are missing — code added hooks not yet in DB
                     //      (e.g. merging branches that extend the same version), or
@@ -2317,7 +2329,7 @@ public function loadActivePlugins(): void
             // adds [NC] to the private-uploads rewrite. Idempotent; a file the operator
             // edited by hand is left alone.
             if (!PrivateUploadsRewriteHeal::heal()) {
-                SecureLogger::error('[PluginManager] public/.htaccess not updated for #480: add [NC] to the RewriteRule ^uploads/(digital|archives/documents|storage)/ line by hand');
+                SecureLogger::error('[PluginManager] public/.htaccess still lets private uploads be served from disk (#480): put "RewriteRule ^uploads/(digital|archives/documents|storage)/ index.php [NC,QSA,L]" before the public /uploads/ rule, or restore the shipped file');
             }
 
             QueryCache::set($maintenanceKey, 1, 900);
@@ -2748,6 +2760,45 @@ public static function clearPluginCache(): void
         SitemapCache::invalidate('plugin lifecycle change');
     }
 
+    /**
+     * An inactive plugin whose tables already exist only gets them synced by
+     * onActivate: a column or foreign key a later version adds stays missing until
+     * someone switches the plugin on (ncip_transactions.prenotazione_id on an
+     * install upgraded from 0.7.x). Bring those tables to this version without
+     * registering any hook. A plugin whose tables are not there (never installed,
+     * like an untouched Archives) is left alone: activating it creates them.
+     *
+     * @param array<string, mixed> $pluginMeta
+     */
+    private function syncInactivePluginSchema(int $pluginId, string $pluginName, array $pluginMeta): void
+    {
+        try {
+            // Schema only: no setPluginId(), which would register the hooks of a
+            // plugin that is switched off (or, for digital-library, move its files).
+            $schemaInstance = $this->instantiatePlugin([
+                'id'        => $pluginId,
+                'name'      => $pluginName,
+                'path'      => $pluginName,
+                'main_file' => $pluginMeta['main_file'] ?? 'wrapper.php',
+            ], false);
+            // is_callable, not method_exists: most wrappers forward to the
+            // plugin class through __call.
+            $declared = is_callable([$schemaInstance, 'expectedTables']) ? $schemaInstance->expectedTables() : [];
+            $tablesInstalled = is_array($declared) && $declared !== []
+                && !$this->expectedTablesMissing($schemaInstance);
+            if ($tablesInstalled && is_callable([$schemaInstance, 'ensureSchema'])
+                && ($this->expectedColumnsMissing($schemaInstance) || $this->expectedForeignKeysMissing($schemaInstance))) {
+                $schemaResult = $schemaInstance->ensureSchema();
+                if (is_array($schemaResult) && !empty($schemaResult['failed'])) {
+                    SecureLogger::warning("[PluginManager] Schema sync of inactive $pluginName left: " . implode(', ', (array) $schemaResult['failed']));
+                }
+            }
+        } catch (\Throwable $e) {
+            // Not fatal: activating the plugin runs ensureSchema again.
+            SecureLogger::warning("[PluginManager] Schema sync of inactive $pluginName failed: " . $e->getMessage());
+        }
+    }
+
     /**
      * Version stamp used to scope the maintenance marker: a new release (new
      * version.json) invalidates it so bundled plugins re-sync right away.
@@ -2871,7 +2922,13 @@ private function disableOrphanHook(int $pluginId, string $hookName, string $call
         return $affected > 0;
     }
 
-    private function instantiatePlugin(array $plugin): object
+    /**
+     * Build a plugin instance. $setPluginId false gives a schema-only instance: some
+     * plugins (digital-library, open-library, goodlib, scraping-pro) register their
+     * hooks in setPluginId(), and digital-library also moves its files, which a
+     * plugin the admin switched off must not do. No ensureSchema() reads the id.
+     */
+    private function instantiatePlugin(array $plugin, bool $setPluginId = true): object
     {
         // Save plugin data to prefixed variables before require_once
         // This prevents plugin files from overwriting $plugin variable (which some do)
@@ -2893,7 +2950,7 @@ private function instantiatePlugin(array $plugin): object
 
         $instance = new $className($this->db, $this->hookManager);
 
-        if (is_callable([$instance, 'setPluginId'])) {
+        if ($setPluginId && is_callable([$instance, 'setPluginId'])) {
             try {
                 $instance->setPluginId($_pluginId);
             } catch (\Throwable $e) {