feat: added cancel buttons, improved error page when database is offline

thorsten · thorsten · commit 2e1885665e89 · 2025-08-23T18:40:25.000+02:00
diff --git a/phpmyfaq/add.php b/phpmyfaq/add.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This is the page there a user can add a FAQ record.
+ * This is the page where a user can add a FAQ record.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public License,
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
@@ -74,7 +74,8 @@
         $readonly = ' readonly';
     }
 
-    // Display full form even if user switched off single fields because of use together with answering open questions
+    // Display full form even if the user switched off single fields because of use together with answering open
+    // questions
     $displayFullForm = true;
 }
 
@@ -90,7 +91,7 @@
 $categories = $category->getAllCategoryIds();
 
 $twig = new TwigWrapper(PMF_ROOT_DIR . '/assets/templates/');
-$twig->addFilter(new TwigFilter('repeat', fn($string, $times) => str_repeat((string) $string, $times)));
+$twig->addFilter(new TwigFilter('repeat', fn($string, $times): string => str_repeat((string) $string, $times)));
 $twigTemplate = $twig->loadTemplate('./add.twig');
 
 // Twig template variables
diff --git a/phpmyfaq/ask.php b/phpmyfaq/ask.php
@@ -62,7 +62,7 @@
 $categories = $category->getAllCategoryIds();
 
 $twig = new TwigWrapper(PMF_ROOT_DIR . '/assets/templates/');
-$twig->addFilter(new TwigFilter('repeat', fn($string, $times) => str_repeat((string) $string, $times)));
+$twig->addFilter(new TwigFilter('repeat', fn($string, $times): string => str_repeat((string) $string, $times)));
 $twigTemplate = $twig->loadTemplate('./ask.twig');
 
 $templateVars = [
diff --git a/phpmyfaq/assets/templates/admin/content/category.add.twig b/phpmyfaq/assets/templates/admin/content/category.add.twig
@@ -190,6 +190,9 @@
 
       <div class="row mb-2">
         <div class="offset-lg-2 col-lg-4 text-end">
+          <a class="btn btn-secondary" href="./category">
+            {{ buttonCancel }}
+          </a>
           <button class="btn btn-primary" type="submit" name="submit">
             {{ ad_categ_add }}
           </button>
diff --git a/phpmyfaq/assets/templates/admin/content/category.edit.twig b/phpmyfaq/assets/templates/admin/content/category.edit.twig
@@ -184,6 +184,9 @@
 
         <div class="row mb-2">
           <div class="offset-lg-2 col-lg-4 text-end">
+            <a class="btn btn-secondary" href="./category">
+              {{ buttonCancel }}
+            </a>
             <button class="btn btn-primary" type="submit" name="submit">
               {{ buttonUpdate }}
             </button>
diff --git a/phpmyfaq/search.php b/phpmyfaq/search.php
@@ -142,7 +142,7 @@
             }
         }
 
-        uasort($relatedTags, static fn($a, $b) => $b - $a);
+        uasort($relatedTags, static fn($a, $b): int => $b - $a);
         $numTags = 0;
 
         foreach ($relatedTags as $tagId => $relevance) {
@@ -274,7 +274,7 @@
 
 $twig = new TwigWrapper(PMF_ROOT_DIR . '/assets/templates/');
 $twig->addExtension(new AttributeExtension(TagNameTwigExtension::class));
-$twig->addFilter(new TwigFilter('repeat', fn($string, $times) => str_repeat((string) $string, $times)));
+$twig->addFilter(new TwigFilter('repeat', fn($string, $times): string => str_repeat((string) $string, $times)));
 $twigTemplate = $twig->loadTemplate('./search.twig');
 
 $pageHeader = ($tagSearch ? Translation::get('msgTagSearch') : Translation::get('msgAdvancedSearch'));
diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php
@@ -754,6 +754,7 @@ private function getBaseTemplateVars(): array
             'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'),
             'restricted_groups' => ($this->configuration->get('security.permLevel') === 'medium') ?
                 $this->currentUser->perm->getAllGroupsOptions([], $this->currentUser) : '',
+            'buttonCancel' => Translation::get('ad_gen_cancel'),
         ];
     }
 }
diff --git a/phpmyfaq/src/phpMyFAQ/Database.php b/phpmyfaq/src/phpMyFAQ/Database.php
@@ -103,13 +103,14 @@ public static function errorPage(string $method): void
             <head>
                 <meta charset="utf-8">
                 <title>Fatal phpMyFAQ Error</title>
-                <link href="assets/dist/styles.css" rel="stylesheet">
-                <script src="assets/dist/frontend.js"></script>
+                <link href="assets/public/styles.css" rel="stylesheet">
+                <script src="assets/public/frontend.js"></script>
             </head>
             <body>
-                <div class="container mt-5">
-                <p class="alert alert-danger">The connection to the database server could not be established.</p>
-                <p class="alert alert-danger">The error message of the database server: ' . $method . '</p>
+                <div class="container">
+                <h1 class="pt-5">Fatal phpMyFAQ Error</h1>
+                <p class="alert alert-danger mt-5">The connection to the database server could not be established.</p>
+                <p class="alert alert-info p-2">The error message of the database server: ' . $method . '</p>
                 </div>
             </body>
             </html>';
diff --git a/phpmyfaq/src/phpMyFAQ/Export/Pdf/Wrapper.php b/phpmyfaq/src/phpMyFAQ/Export/Pdf/Wrapper.php
@@ -637,6 +637,7 @@ public function convertExternalImagesToBase64(string $html): string
                 if ($allowedHost === '') {
                     continue;
                 }
+
                 if ($allowedHost === '0') {
                     continue;
                 }
diff --git a/phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php b/phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php
@@ -179,7 +179,7 @@ public function cleanUpContent(string $content): string
         return preg_replace_callback(
             '/style\s*=\s*"([^"]*)"/i',
             function (array $matches): string {
-                $styles = explode(';', (string) $matches[1]);
+                $styles = explode(';', $matches[1]);
                 $filteredStyles = array_filter($styles, function (string $style): bool {
                     return stripos(trim($style), 'overflow:') !== 0; // Exclude 'overflow' properties
                 });
diff --git a/tests/phpMyFAQ/DatabaseTest.php b/tests/phpMyFAQ/DatabaseTest.php
@@ -69,11 +69,11 @@ public function testErrorPage(): void
             $output
         );
         $this->assertStringContainsString(
-            '<p class="alert alert-danger">The connection to the database server could not be established.</p>',
+            '<p class="alert alert-danger mt-5">The connection to the database server could not be established.</p>',
             $output
         );
         $this->assertStringContainsString(
-            '<p class="alert alert-danger">The error message of the database server: Error message</p>',
+            '<p class="alert alert-info p-2">The error message of the database server: Error message</p>',
             $output
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`- uasort($relatedTags, static fn($a, $b) => $b - $a);`
	`145`	`+ uasort($relatedTags, static fn($a, $b): int => $b - $a);`
`146`	`146`	`$numTags = 0;`
`147`	`147`
`148`	`148`	`foreach ($relatedTags as $tagId => $relevance) {`
`@@ -274,7 +274,7 @@`
`274`	`274`
`275`	`275`	`$twig = new TwigWrapper(PMF_ROOT_DIR . '/assets/templates/');`
`276`	`276`	`$twig->addExtension(new AttributeExtension(TagNameTwigExtension::class));`
`277`		`-$twig->addFilter(new TwigFilter('repeat', fn($string, $times) => str_repeat((string) $string, $times)));`
	`277`	`+$twig->addFilter(new TwigFilter('repeat', fn($string, $times): string => str_repeat((string) $string, $times)));`
`278`	`278`	`$twigTemplate = $twig->loadTemplate('./search.twig');`
`279`	`279`
`280`	`280`	`$pageHeader = ($tagSearch ? Translation::get('msgTagSearch') : Translation::get('msgAdvancedSearch'));`
Original file line number	Diff line number	Diff line change
`@@ -754,6 +754,7 @@ private function getBaseTemplateVars(): array`
`754`	`754`	`'ad_entry_restricted_groups' => Translation::get('ad_entry_restricted_groups'),`
`755`	`755`	`'restricted_groups' => ($this->configuration->get('security.permLevel') === 'medium') ?`
`756`	`756`	`$this->currentUser->perm->getAllGroupsOptions([], $this->currentUser) : '',`
	`757`	`+ 'buttonCancel' => Translation::get('ad_gen_cancel'),`
`757`	`758`	`];`
`758`	`759`	`}`
`759`	`760`	`}`
Original file line number	Diff line number	Diff line change
`@@ -637,6 +637,7 @@ public function convertExternalImagesToBase64(string $html): string`
`637`	`637`	`if ($allowedHost === '') {`
`638`	`638`	`continue;`
`639`	`639`	`}`
	`640`	`+`
`640`	`641`	`if ($allowedHost === '0') {`
`641`	`642`	`continue;`
`642`	`643`	`}`