head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.42
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.40
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.38
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.36
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.34
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.32
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.30
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.28
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.26
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.24
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.22
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.20
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.18
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.16
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.14
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.12
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.10
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.8
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.6
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.4
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.2
	pkgsrc-2021Q1-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2021.01.19.08.12.06;	author wiz;	state Exp;
branches;
next	;
commitid	VP6YbpYrekzcnjEC;


desc
@@


1.1
log
@net/icingaweb2: import icingaweb2-2.8.2

Packaged for wip by Edgar Fuß.

Icinga Web 2 is a powerful PHP framework for web applications that comes
in a clean and reduced design.
It's fast, responsive, accessible and easily extensible with modules.
@
text
@$NetBSD$

Replace convoluted path computation by something much simpler that 
actually works reliably.

--- library/Icinga/Application/webrouter.php.orig	2018-11-21 09:19:00.000000000 +0100
+++ library/Icinga/Application/webrouter.php	2019-03-21 17:00:08.000000000 +0100
@@@@ -9,12 +9,6 @@@@
 
 error_reporting(E_ALL | E_STRICT);
 
-if (isset($_SERVER['REQUEST_URI'])) {
-    $ruri = $_SERVER['REQUEST_URI'];
-} else {
-    return false;
-}
-
 // Workaround, PHPs internal Webserver seems to mess up SCRIPT_FILENAME
 // as it prefixes it's absolute path with DOCUMENT_ROOT
 if (preg_match('/^PHP .* Development Server/', $_SERVER['SERVER_SOFTWARE'])) {
@@@@ -28,18 +22,12 @@@@
 $baseDir = $_SERVER['DOCUMENT_ROOT'];
 $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
 
-// Fix aliases
-$remove = str_replace('\\', '/', dirname($_SERVER['PHP_SELF']));
-if (substr($ruri, 0, strlen($remove)) !== $remove) {
-    return false;
-}
-$ruri = ltrim(substr($ruri, strlen($remove)), '/');
-
-if (strpos($ruri, '?') === false) {
-    $params = '';
-    $path = $ruri;
+if (!isset($_SERVER['PATH_INFO'])) {
+    $path = '';
+} elseif ($_SERVER['PATH_INFO'] === '') {
+    $path = '';
 } else {
-    list($path, $params) = preg_split('/\?/', $ruri, 2);
+    $path = ltrim($_SERVER['PATH_INFO'], '/'); // remove leading slash
 }
 
 $special = array(
@