From 339321a322a807fb67e69c40e2e66d960dfd0259 Mon Sep 17 00:00:00 2001
From: Chris <christian@haschek.at>
Date: Thu, 26 Oct 2023 22:04:05 +0200
Subject: [PATCH] autofworward after login

---
 web/inc/core.php               |  2 +-
 web/pages/err/controller.php   |  3 ++-
 web/pages/err/notallowed.html  | 13 +++++++++++++
 web/pages/login/controller.php |  5 ++++-
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 web/pages/err/notallowed.html

diff --git a/web/inc/core.php b/web/inc/core.php
index e1167b0..dbc8617 100644
--- a/web/inc/core.php
+++ b/web/inc/core.php
@@ -82,7 +82,7 @@ function callHook($url)
     if (!$dispatch->maySeeThisPage()) {
         $componentName = 'err';
         $action = 'notallowed';
-        $dispatch = new $componentName('error', $action, true);
+        $dispatch = new $componentName('err', $action, true);
     } else
         $dispatch = new $componentName($component, $action, true, $queryString);
 
diff --git a/web/pages/err/controller.php b/web/pages/err/controller.php
index b91fde0..07a3646 100644
--- a/web/pages/err/controller.php
+++ b/web/pages/err/controller.php
@@ -11,7 +11,8 @@ class Err extends Page {
 
     function notallowed()
     {
-        return json_encode(['error'=>'not allowed']);
+        $this->set("loggedin",(isset($_SESSION['user']) && $_SESSION['user'] !== false));
+        $this->set('template', "notallowed.html");
     }
 
 }
\ No newline at end of file
diff --git a/web/pages/err/notallowed.html b/web/pages/err/notallowed.html
new file mode 100644
index 0000000..b550ba4
--- /dev/null
+++ b/web/pages/err/notallowed.html
@@ -0,0 +1,13 @@
+<div class="alert alert-danger animate__animated animate__headShake" role="alert">
+      <h4 class="alert-heading">Not allowed</h4>
+    Zugriff nicht erlaubt
+  </div>
+
+<div class="row justify-content-center align-items-center g-2">
+    <div class="col"></div>
+    <div class="col">
+        <?php if(!$loggedin) : ?>
+            <?= partial('../../pages/login/login.html');   ?>
+        <?php endif; ?></div>
+    <div class="col"></div>
+</div>
diff --git a/web/pages/login/controller.php b/web/pages/login/controller.php
index 242edf4..483b330 100644
--- a/web/pages/login/controller.php
+++ b/web/pages/login/controller.php
@@ -78,7 +78,10 @@ class Login extends Page {
             else
             {
                 $u->login();
-                $this->redirect('/');
+                if($_SERVER['HTTP_HX_CURRENT_URL'] && !endsWith($_SERVER['HTTP_HX_CURRENT_URL'],'/login'))
+                    $this->redirect($_SERVER['HTTP_HX_CURRENT_URL']);
+                else
+                    $this->redirect('/');
             }
         }