standalone access denied: show login form with 403 on page route

diff --git a/CRM/Utils/System/Standalone.php b/CRM/Utils/System/Standalone.php
index 18f5b7bfc7e6933dd94d9c50d4802b09ff01f80e..265d2ef4385ebd5f75e618276f29faa2b85e7835 100644 (file)
--- a/CRM/Utils/System/Standalone.php
+++ b/CRM/Utils/System/Standalone.php
@@ -584,10 +584,17 @@ class CRM_Utils_System_Standalone extends CRM_Utils_System_Base {
       CRM_Core_Error::statusBounce(ts("Access denied"), CRM_Utils_System::url('civicrm'));
     }
     else {
-      CRM_Utils_System::redirect('/civicrm/login?anonAccessDenied');
-    }
+      http_response_code(403);
+
+      // render a login page
+      if (class_exists('CRM_Standaloneusers_Page_Login')) {
+        $loginPage = new CRM_Standaloneusers_Page_Login();
+        $loginPage->assign('anonAccessDenied', TRUE);
+        return $loginPage->run();
+      }
 
-    // TODO: Prettier error page
+      throw new CRM_Core_Exception('Access denied. Standaloneusers extension not found');
+    }
   }
 
 }

diff --git a/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php b/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php
index d9017529dc5bd94e0ea85a790a6c3665cb7be045..31aa791d6ea318bb107d14cdb7a5b5850c9ab47d 100644 (file)
--- a/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php
+++ b/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php
@@ -17,7 +17,6 @@ class CRM_Standaloneusers_Page_Login extends CRM_Core_Page {
     // Remove breadcrumb for login page.
     $this->assign('breadcrumb', NULL);
 
-    $this->assign('anonAccessDenied', isset($_GET['anonAccessDenied']));
     $this->assign('justLoggedOut', isset($_GET['justLoggedOut']));
 
     parent::run();