Delete legacy home page

front/central.php

@@ -56,7 +56,7 @@
  if ($_SESSION['glpiactiveprofile']['create_ticket_on_login']) {
  Html::redirect($CFG_GLPI['root_doc'] . "/ServiceCatalog");
  } else {
- Html::redirect($CFG_GLPI['root_doc'] . "/front/helpdesk.public.php");
+ Html::redirect($CFG_GLPI['root_doc'] . "/Helpdesk");
  }
  }
  $_SESSION['_redirected_from_profile_selector'] = true;

src/Auth.php

@@ -1572,7 +1572,7 @@ public static function redirectIfAuthenticated($redirect = null)
  if ($_SESSION['glpiactiveprofile']['create_ticket_on_login']) {
  Html::redirect($CFG_GLPI['root_doc'] . "/ServiceCatalog");
  }
- Html::redirect($CFG_GLPI['root_doc'] . "/front/helpdesk.public.php");
+ Html::redirect($CFG_GLPI['root_doc'] . "/Helpdesk");
  } else {
  if ($_SESSION['glpiactiveprofile']['create_ticket_on_login']) {
  Html::redirect(Ticket::getFormURL());

src/Entity.php

@@ -3066,7 +3066,7 @@ public static function getEntitySelectorTree(): array
 
  $base_path = $CFG_GLPI['root_doc'] . "/front/central.php";
  if (Session::getCurrentInterface() === 'helpdesk') {
- $base_path = $CFG_GLPI["root_doc"] . "/front/helpdesk.public.php";
+ $base_path = $CFG_GLPI["root_doc"] . "/Helpdesk";
  }
 
  $ancestors = getAncestorsOf('glpi_entities', $_SESSION['glpiactive_entity']);

src/Glpi/Application/View/Extension/RoutingExtension.php

@@ -71,7 +71,7 @@ public function indexPath(): string
  $index = '/index.php';
  if (Session::getLoginUserID() !== false) {
  $index = Session::getCurrentInterface() == 'helpdesk'
- ? 'front/helpdesk.public.php'
+ ? 'Home'
  : 'front/central.php';
  }
  return Html::getPrefixedUrl($index);

src/Glpi/Controller/SelfService/HomeController.php → src/Glpi/Controller/Helpdesk/IndexController.php

@@ -42,8 +42,10 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
+use User;
+use Session;
 
-final class HomeController extends AbstractController
+final class IndexController extends AbstractController
 {
  private TilesManager $tiles_manager;
 
@@ -54,19 +56,28 @@ public function __construct()
 
  #[SecurityStrategy(Firewall::STRATEGY_HELPDESK_ACCESS)]
  #[Route(
- "/Home",
+ "/Helpdesk",
  name: "glpi_selfservice_home",
  methods: "GET"
  )]
+ // Prevent old links from breaking
+ #[Route(
+ '/front/helpdesk.public.php',
+ name: "glpi_selfservice_home_deprecated",
+ methods: "GET"
+ )]
  public function __invoke(Request $request): Response
  {
+ $user = User::getById(Session::getLoginUserID());
+
  // Will rename the file to "home.html.twig" later, don't want to remove
  // the original file yet.
- return $this->render('pages/self-service/new_home.html.twig', [
+ return $this->render('pages/self-service/index.html.twig', [
  'title' => __("Home"),
  'menu' => ['helpdesk-home'],
  'tiles' => $this->tiles_manager->getTiles(),
  'tabs' => new HomePageTabs(),
+ 'password_alert' => $user->getPasswordExpirationMessage(),
  ]);
  }
 }

src/Glpi/Form/SelfService/TilesManager.php

@@ -83,9 +83,9 @@ public function getTiles(): array
  title: __("View RSS feeds"),
  description: __("Checkout new data from your saved RSS feeds."),
  illustration: "view-feed.svg",
- // TODO: create dedicated RSS page, the only place they are
- // visible is on the dashboard of the legacy home page.
- link: "/front/helpdesk.public.php"
+ // TODO: replace this default tile by something more useful, rss
+ // feeds are already displayed on the home page using a tab
+ link: "/Helpdesk"
  );
 
  return $tiles;

src/Html.php

@@ -1546,7 +1546,7 @@ public static function generateHelpMenu()
 
  $menu = [
  'home' => [
- 'default' => '/front/helpdesk.public.php',
+ 'default' => '/Helpdesk',
  'title' => __('Home'),
  'icon' => 'fas fa-home',
  ],

src/Toolbox.php

@@ -1502,7 +1502,7 @@ public static function manageRedirect($where)
  if ($matches[1] !== $CFG_GLPI['url_base']) {
  Session::addMessageAfterRedirect(__s('Redirection failed'));
  if (Session::getCurrentInterface() === "helpdesk") {
- Html::redirect($CFG_GLPI["root_doc"] . "/front/helpdesk.public.php");
+ Html::redirect($CFG_GLPI["root_doc"] . "/Helpdesk");
  } else {
  Html::redirect($CFG_GLPI["root_doc"] . "/front/central.php");
  }
@@ -1566,7 +1566,7 @@ public static function manageRedirect($where)
  }
  }
 
- Html::redirect($CFG_GLPI["root_doc"] . "/front/helpdesk.public.php");
+ Html::redirect($CFG_GLPI["root_doc"] . "/Helpdesk");
  // phpcs doesn't understand that the script will exit here so we need a comment to avoid the fallthrough warning
 
  case "preference":
@@ -1578,7 +1578,7 @@ public static function manageRedirect($where)
  // phpcs doesn't understand that the script will exit here so we need a comment to avoid the fallthrough warning
 
  default:
- Html::redirect($CFG_GLPI["root_doc"] . "/front/helpdesk.public.php");
+ Html::redirect($CFG_GLPI["root_doc"] . "/Helpdesk");
  }
  // @phpstan-ignore deadCode.unreachable (defensive programming)
  break;

templates/layout/parts/profile_selector.html.twig

@@ -51,7 +51,7 @@
 
 {% set target = path("front/central.php") %}
 {% if get_current_interface() == "helpdesk" %}
- {% set target = path("front/helpdesk.public.php") %}
+ {% set target = path("home") %}
 {% endif %}
 
 {% set current_entity = session('glpiactive_entity_name') %}