From ac94824e8890b91a3ea3ba3d2123647b0979f742 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Thu, 16 Nov 2023 16:12:09 +0000
Subject: [PATCH] fixes #3477

Closes #3477

Merge request studip/studip!2373
---
 app/controllers/consultation/admin.php              |  4 ++++
 .../consultation/consultation_controller.php        | 13 +++++++++++++
 app/controllers/consultation/overview.php           |  4 ++++
 app/views/consultation/not_found.php                | 10 ++++++++++
 4 files changed, 31 insertions(+)
 create mode 100644 app/views/consultation/not_found.php

diff --git a/app/controllers/consultation/admin.php b/app/controllers/consultation/admin.php
index e5a709fa314..7acb7259291 100644
--- a/app/controllers/consultation/admin.php
+++ b/app/controllers/consultation/admin.php
@@ -16,6 +16,10 @@ class Consultation_AdminController extends ConsultationController
     {
         parent::before_filter($action, $args);
 
+        if (!$this->range || $action === 'not_found') {
+            return;
+        }
+
         if (!$this->range->isEditableByUser()) {
             $this->redirect('consultation/overview');
             return;
diff --git a/app/controllers/consultation/consultation_controller.php b/app/controllers/consultation/consultation_controller.php
index 1c25a9bddc7..d6927aff181 100644
--- a/app/controllers/consultation/consultation_controller.php
+++ b/app/controllers/consultation/consultation_controller.php
@@ -12,14 +12,21 @@ abstract class ConsultationController extends AuthenticatedController
     {
         parent::before_filter($action, $args);
 
+        $type = 'person';
         if (Request::submitted('username')) {
             $this->range = User::findByUsername(Request::username('username'));
         } elseif (Request::submitted('cid')) {
             $this->range = Context::get();
+            $type = 'object';
         } else {
             $this->range = $GLOBALS['user']->getAuthenticatedUser();
         }
 
+        if (!$this->range) {
+            $this->redirect($this->not_foundURL($type));
+            return;
+        }
+
         if ($this->range instanceof User) {
             URLHelper::addLinkParam('username', $this->range->username);
         } elseif ($this->range instanceof Course || $this->range instanceof Institute) {
@@ -47,6 +54,12 @@ abstract class ConsultationController extends AuthenticatedController
         };
     }
 
+    public function not_found_action(string $type): void
+    {
+        $this->type = $type;
+        $this->render_template('consultation/not_found', $this->layout);
+    }
+
     protected function activateNavigation($path)
     {
         $path = ltrim($path, '/');
diff --git a/app/controllers/consultation/overview.php b/app/controllers/consultation/overview.php
index c8085f2cd3a..ce6cd316b0e 100644
--- a/app/controllers/consultation/overview.php
+++ b/app/controllers/consultation/overview.php
@@ -14,6 +14,10 @@ class Consultation_OverviewController extends ConsultationController
     {
         parent::before_filter($action, $args);
 
+        if (!$this->range) {
+            return;
+        }
+
         if ($this->range->isEditableByUser()) {
             $this->redirect('consultation/admin');
             return;
diff --git a/app/views/consultation/not_found.php b/app/views/consultation/not_found.php
new file mode 100644
index 00000000000..71cd0403d47
--- /dev/null
+++ b/app/views/consultation/not_found.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * @var string $type
+ */
+?>
+<?= MessageBox::error(
+    $type === 'person'
+        ? _('Die Person, für die die Sprechstunden angezeigt werden sollen, ist nicht mehr vorhanden')
+        : _('Das Objekt, für das die Sprechstunden angezeigt werden sollen, ist nicht mehr vorhanden')
+)->hideClose() ?>
-- 
GitLab