edit

Author: JamesDAdams

custom-redirect.js

@@ -10,24 +10,14 @@ let errorGif = "";
 const REDIRECT = {
   /**
    * Generates HTML content with appropriate Canva URL
-   * @param {boolean} enableReportError - Whether to include the report button
    * @returns {string} The HTML with injected URL
    */
-  generateErrorPage: (enableReportError = false) => {
-    let page = errorTemplate
-      .replace('ERROR_CODE', errorCode)
-      .replace('ERROR_TYPE', errorType)
-      .replace('ERROR_MESSAGE', errorMessage)
-      .replace('ERROR_GIF', errorGif);
-
-    if (!enableReportError) {
-      page = page.replace(
-        /<!-- BEGIN_REPORT_BUTTON -->.*?<!-- END_REPORT_BUTTON -->/s,
-        ''
-      );
-    }
-
-    return page;
+  generateErrorPage: () => {
+    return errorTemplate
+    .replace('ERROR_CODE', errorCode)
+    .replace('ERROR_TYPE', errorType)
+    .replace('ERROR_MESSAGE', errorMessage)
+    .replace('ERROR_GIF', errorGif);
   }
 };
 

html/error-template.html

@@ -22,9 +22,10 @@
     <div id="error-message" class="error-message">ERROR_MESSAGE</div>
     <img class="gif" src="ERROR_GIF" alt="Error illustration">
     <!-- Conditionally render the report button -->
+    <!-- If ENABLE_REPORT_ERROR is true, render the button -->
+    <!-- Placeholder for server-side rendering -->
     <!-- BEGIN_REPORT_BUTTON -->
-    <!-- The button will only be rendered if ENABLE_REPORT_ERROR is true -->
-    <!-- This placeholder will be dynamically replaced server-side -->
+    <button id="open-report-modal" class="report-btn" data-link="" data-site="">Signaler cette erreur</button>
     <!-- END_REPORT_BUTTON -->
   </div>
   <!-- Embedded front-end script for modal and reporting -->
@@ -193,4 +194,3 @@
   </script>
 </body>
 </html>
-</html>

worker.js

@@ -158,13 +158,7 @@ export default {
 
     // Custom error page
     const redirectResponse = await c_redirect(request, response, null, isMaintenance, env);
-    if (redirectResponse) {
-      const enableReportError = env.ENABLE_REPORT_ERROR === true;
-      return new Response(REDIRECT.generateErrorPage(enableReportError), {
-        status: response?.status || 500,
-        headers: { 'Content-Type': 'text/html' }
-      });
-    }
+    if (redirectResponse) return redirectResponse;
 
     // Banner injection - check for 4G mode or regular banner
     let showBanner = false;