From db4f0c3d80543a4a27238876ce9623b31598dea3 Mon Sep 17 00:00:00 2001
From: ruan <ruany@users.noreply.github.com>
Date: Wed, 17 Feb 2016 06:10:07 +0200
Subject: [PATCH] Add original "access denied" error to access-denied.php

---
 error/access-denied.php | 16 ++++++++++++++++
 inc/settings.php        |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/error/access-denied.php b/error/access-denied.php
index 2e2a03d..c5c4add 100644
--- a/error/access-denied.php
+++ b/error/access-denied.php
@@ -16,6 +16,22 @@
             The web interface was unable to connect to the database using the configuration provided.
             <br>
             Database error: Access denied
+            <br>
+            <?php
+            if (isset($_GET['error'])) {
+                $error = $_GET['error'];
+                if (strlen($error) <= 1024) {
+                    $error = base64_decode($error, true);
+
+                    if ($error !== false) {
+                        // sanitize user input
+                        $error = htmlspecialchars($error, ENT_QUOTES, "UTF-8");
+
+                        echo $error;
+                    }
+                }
+            }
+            ?>
         </div>
         <br>
         <a href="../" class="btn btn-default">Try Again</a>
diff --git a/inc/settings.php b/inc/settings.php
index a4bdff5..2c8f48d 100644
--- a/inc/settings.php
+++ b/inc/settings.php
@@ -130,7 +130,7 @@ final class Settings {
         $message = $e->getMessage();
         if ($settings->error_pages) {
             if (strstr($message, "Access denied for user")) {
-                $settings->redirect("error/access-denied.php");
+                $settings->redirect("error/access-denied.php?error=" . base64_encode($message));
             }
             if (strstr($message, "Base table or view not found:")) {
                 $settings->redirect("error/tables-not-found.php");