Merge branch '4.0' into 'main'

thorsten · Dec 11, 2024 · a587c82 · a587c82
2 parents 37070d4 + 8612be6
commit a587c82
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/phpmyfaq/assets/scss/layout/_autocomplete.scss b/phpmyfaq/assets/scss/layout/_autocomplete.scss
@@ -24,7 +24,6 @@
     top: 5px;
     right: 5px;
     height: 50px;
-    width: 110px;
   }
 }
 

diff --git a/phpmyfaq/assets/src/configuration/update.js b/phpmyfaq/assets/src/configuration/update.js
@@ -53,7 +53,9 @@ export const handleUpdateInformation = async () => {
       button.disabled = false;
     } catch (errorMessage) {
       if (errorMessage instanceof SyntaxError) {
-        errorMessage = 'The requested resource was not found on the server. Please check your server configuration.';
+        errorMessage =
+          'The requested resource was not found on the server. ' +
+          'Please check your server configuration, especially the RewriteBase in your .htaccess configuration.';
       } else {
         errorMessage = errorMessage.message;
       }
@@ -142,10 +144,13 @@ export const handleDatabaseUpdate = async () => {
 
         await pump();
       }
+
       await pump();
     } catch (error) {
       const errorMessage =
-        error.cause && error.cause.response ? await error.cause.response.json() : { error: 'Unknown error' };
+        error.cause && error.cause.response
+          ? await error.cause.response.json()
+          : { error: 'Unknown database error during update.' };
       const alert = document.getElementById('phpmyfaq-update-database-error');
 
       alert.classList.remove('d-none');

diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
@@ -681,4 +681,13 @@
     'last_modified' => new DateTime()
 ]);
 
+//
+// Avoid automatic downloads
+// and prevent browsers from interpreting files as a different MIME type than what is specified
+//
+if ($action !== 'attachment') {
+    $response->headers->set('Content-Disposition', 'inline');
+}
+$response->headers->set('X-Content-Type-Options', 'nosniff');
+
 $response->send();
diff --git a/phpmyfaq/src/phpMyFAQ/Setup/Installer.php b/phpmyfaq/src/phpMyFAQ/Setup/Installer.php
@@ -640,7 +640,9 @@ public function checkBasicStuff(): void
         }
 
         if (!$this->system->checkInstallation()) {
-            throw new Exception('phpMyFAQ is already installed! Please use the <a href="../update">update</a>.');
+            throw new Exception(
+                'Looks like phpMyFAQ is already installed! Please use the <a href="../update">update</a>.'
+            );
         }
     }