Merge branch '4.1' into 'main'

Author: thorsten

CHANGELOG.md

@@ -42,6 +42,7 @@ This is a log of major user-visible changes in each phpMyFAQ release.
 
 ### phpMyFAQ v4.1.1 - unreleased
 
+- updated third party dependencies (Thorsten)
 - fixed bugs (Thorsten)
 
 ### phpMyFAQ v4.1.0 - 2026-03-12

phpmyfaq/assets/src/configuration/update.test.ts

@@ -92,7 +92,7 @@ describe('handleUpdateInformation', () => {
 
   it('should do nothing when URL does not end with /update', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/admin' },
+      value: { href: 'http://localhost/admin', pathname: '/admin' },
       writable: true,
     });
 
@@ -105,7 +105,7 @@ describe('handleUpdateInformation', () => {
 
   it('should do nothing when installed version input is missing', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update' },
+      value: { href: 'http://localhost/update', pathname: '/update' },
       writable: true,
     });
 
@@ -119,7 +119,7 @@ describe('handleUpdateInformation', () => {
 
   it('should show success alert and enable button on successful check', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update' },
+      value: { href: 'http://localhost/update', pathname: '/update' },
       writable: true,
     });
 
@@ -153,9 +153,9 @@ describe('handleUpdateInformation', () => {
     expect(button.disabled).toBe(false);
   });
 
-  it('should show error alert on failed check response', async () => {
+  it('should show error alert on failed check response with JSON content type', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update' },
+      value: { href: 'http://localhost/update', pathname: '/update' },
       writable: true,
     });
 
@@ -167,6 +167,7 @@ describe('handleUpdateInformation', () => {
 
     global.fetch = vi.fn().mockResolvedValue({
       ok: false,
+      headers: { get: (name: string) => (name === 'content-type' ? 'application/json' : null) },
       json: () => Promise.resolve({ message: 'Version mismatch' }),
     });
 
@@ -179,9 +180,9 @@ describe('handleUpdateInformation', () => {
     expect(result?.innerText).toBe('Version mismatch');
   });
 
-  it('should show default error message when response has no message', async () => {
+  it('should show default error message when JSON response has no message', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update' },
+      value: { href: 'http://localhost/update', pathname: '/update' },
       writable: true,
     });
 
@@ -193,6 +194,7 @@ describe('handleUpdateInformation', () => {
 
     global.fetch = vi.fn().mockResolvedValue({
       ok: false,
+      headers: { get: (name: string) => (name === 'content-type' ? 'application/json' : null) },
       json: () => Promise.resolve({}),
     });
 
@@ -202,9 +204,9 @@ describe('handleUpdateInformation', () => {
     expect(result?.innerText).toBe('Update check failed');
   });
 
-  it('should show server config error on SyntaxError', async () => {
+  it('should show server config error on non-JSON Not Found response', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update' },
+      value: { href: 'http://localhost/update', pathname: '/update' },
       writable: true,
     });
 
@@ -214,7 +216,11 @@ describe('handleUpdateInformation', () => {
       <div id="phpmyfaq-update-check-result"></div>
     `;
 
-    global.fetch = vi.fn().mockRejectedValue(new SyntaxError('Unexpected token'));
+    global.fetch = vi.fn().mockResolvedValue({
+      ok: false,
+      headers: { get: () => 'text/html' },
+      text: () => Promise.resolve('Not Found'),
+    });
 
     await handleUpdateInformation();
 
@@ -223,9 +229,9 @@ describe('handleUpdateInformation', () => {
     expect(result?.innerText).toContain('RewriteBase');
   });
 
-  it('should show generic error message on other errors', async () => {
+  it('should show connection error message on network failure', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update' },
+      value: { href: 'http://localhost/update', pathname: '/update' },
       writable: true,
     });
 
@@ -240,12 +246,12 @@ describe('handleUpdateInformation', () => {
     await handleUpdateInformation();
 
     const result = document.getElementById('phpmyfaq-update-check-result');
-    expect(result?.innerText).toBe('Network failure');
+    expect(result?.innerText).toContain('Could not connect to the update API');
   });
 
   it('should work with URL ending in /update/', async () => {
     Object.defineProperty(window, 'location', {
-      value: { href: 'http://localhost/update/' },
+      value: { href: 'http://localhost/update/', pathname: '/update/' },
       writable: true,
     });
 

phpmyfaq/assets/src/configuration/update.ts

@@ -30,7 +30,8 @@ export const handleUpdateNextStepButton = (): void => {
 };
 
 export const handleUpdateInformation = async (): Promise<void> => {
-  if (window.location.href.endsWith('/update') || window.location.href.endsWith('/update/')) {
+  const path = window.location.pathname;
+  if (path.endsWith('/update') || path.endsWith('/update/') || path.endsWith('/update/index.php')) {
     const installedVersion = document.getElementById('phpmyfaq-update-installed-version') as HTMLInputElement | null;
 
     if (!installedVersion) return;
@@ -46,13 +47,26 @@ export const handleUpdateInformation = async (): Promise<void> => {
       });
 
       if (!response.ok) {
-        const errorMessage = await response.json();
+        let errorText: string;
+        const contentType = response.headers.get('content-type') || '';
+        if (contentType.includes('application/json')) {
+          const errorMessage = await response.json();
+          errorText = errorMessage.message || errorMessage.error || 'Update check failed';
+        } else {
+          errorText = await response.text();
+          if (!errorText || errorText === 'Not Found') {
+            errorText =
+              'The requested resource was not found on the server. ' +
+              'Please check your server configuration, if you use Apache, the RewriteBase in your .htaccess ' +
+              'configuration. If you use nginx, please check your nginx rewrite configuration.';
+          }
+        }
         const alert = document.getElementById('phpmyfaq-update-check-alert') as HTMLElement | null;
         const alertResult = document.getElementById('phpmyfaq-update-check-result') as HTMLElement | null;
 
         if (alert && alertResult) {
           alert.classList.remove('d-none');
-          alertResult.innerText = errorMessage.message || 'Update check failed';
+          alertResult.innerText = errorText;
         }
         return;
       }
@@ -65,16 +79,11 @@ export const handleUpdateInformation = async (): Promise<void> => {
         button.classList.remove('disabled');
         button.disabled = false;
       }
-    } catch (error: unknown) {
-      let errorMessage: string;
-      if (error instanceof SyntaxError) {
-        errorMessage =
-          'The requested resource was not found on the server. ' +
-          'Please check your server configuration, if you use Apache, the RewriteBase in your .htaccess ' +
-          'configuration. If you use nginx, please check your nginx rewrite configuration.';
-      } else {
-        errorMessage = error instanceof Error ? error.message : String(error);
-      }
+    } catch {
+      const errorMessage =
+        'Could not connect to the update API. Please check your server configuration: ' +
+        'if you use Apache, verify the RewriteBase in your .htaccess matches your installation path. ' +
+        'If you use nginx, check your rewrite configuration.';
       const alert = document.getElementById('phpmyfaq-update-check-alert') as HTMLElement | null;
       const alertResult = document.getElementById('phpmyfaq-update-check-result') as HTMLElement | null;
 
@@ -87,7 +96,8 @@ export const handleUpdateInformation = async (): Promise<void> => {
 };
 
 export const handleConfigBackup = async (): Promise<void> => {
-  if (window.location.href.endsWith('/update?step=2') || window.location.href.endsWith('/update/?step=2')) {
+  const href = window.location.href;
+  if (href.includes('/update') && href.includes('step=2')) {
     const installedVersion = document.getElementById('phpmyfaq-update-installed-version') as HTMLInputElement | null;
 
     if (!installedVersion) return;
@@ -115,7 +125,8 @@ export const handleConfigBackup = async (): Promise<void> => {
 };
 
 export const handleDatabaseUpdate = async (): Promise<void> => {
-  if (window.location.href.endsWith('/update?step=3') || window.location.href.endsWith('/update/?step=3')) {
+  const href = window.location.href;
+  if (href.includes('/update') && href.includes('step=3')) {
     const installedVersion = document.getElementById('phpmyfaq-update-installed-version') as HTMLInputElement | null;
 
     if (!installedVersion) return;