From 993b210bdc1fa01dbcbffbbad14b6515078438d7 Mon Sep 17 00:00:00 2001 From: mbressy Date: Fri, 4 Sep 2026 07:14:21 +0000 Subject: [PATCH 1/2] rm deprecated public prefix from urls --- inc/config.class.php | 8 ++++---- inc/preference.class.php | 2 +- setup.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/config.class.php b/inc/config.class.php index da447ff..f1f1939 100644 --- a/inc/config.class.php +++ b/inc/config.class.php @@ -161,7 +161,7 @@ public function seeTreeview() echo "\n"; echo "\n"; echo "\n"; + $CFG_GLPI['root_doc'] . "/pics/favicon.ico' >\n"; // Must be always the top window echo ''; echo ""; - echo ""; + echo ""; echo ""; echo ''; echo '<body>'; @@ -204,8 +204,8 @@ public function buildTreeview() $treeview_url = $CFG_GLPI['root_doc'] . "/plugins/treeview"; //necessary files needed for the tree to work. - echo sprintf("<link rel='stylesheet' type='text/css' href='%s/public/css/dtree.css' type='text/css'>", $treeview_url); - echo sprintf("<script type='text/javascript' src='%s/public/lib/dtree/dtree.js'></script>", $treeview_url); + echo sprintf("<link rel='stylesheet' type='text/css' href='%s/css/dtree.css' type='text/css'>", $treeview_url); + echo sprintf("<script type='text/javascript' src='%s/lib/dtree/dtree.js'></script>", $treeview_url); echo "<div class='dtree'>"; echo "<script type='text/javascript'>"; diff --git a/inc/preference.class.php b/inc/preference.class.php index 13fd601..91bfc37 100644 --- a/inc/preference.class.php +++ b/inc/preference.class.php @@ -45,7 +45,7 @@ public static function getMenuContent() $menu = []; $menu['title'] = __s('Tree view', 'treeview'); - $menu['page'] = '/' . $CFG_GLPI['root_doc'] . 'plugins/treeview/public/index.php'; + $menu['page'] = '/' . $CFG_GLPI['root_doc'] . 'plugins/treeview/index.php'; $menu['icon'] = 'ti ti-sitemap'; return $menu; diff --git a/setup.php b/setup.php index 94be84b..ca48d60 100644 --- a/setup.php +++ b/setup.php @@ -83,7 +83,7 @@ function plugin_init_treeview() && isset($_SESSION['glpi_plugin_treeview_preference']) && $_SESSION['glpi_plugin_treeview_preference'] == 1 ) { - Html::redirect($CFG_GLPI['root_doc'] . '/plugins/treeview/public/index.php'); + Html::redirect($CFG_GLPI['root_doc'] . '/plugins/treeview/index.php'); } if ( From 9be68a9c6f34f060e606d7b8d78960b75d1f4ea5 Mon Sep 17 00:00:00 2001 From: mbressy <bressy.marie@gmail.com> Date: Fri, 4 Sep 2026 07:22:11 +0000 Subject: [PATCH 2/2] update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce61b7f..d065ffb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - Enforce item / pref rights and sanitize inputs in tree loading +- Remove deprecated `/public` prefix from generated plugin URLs ## [1.20.2] - 2026-06-24