Allow PLA to be served in a subpath, when behind a proxy. Closes #376

Author: leenooks

app/Http/Controllers/HomeController.php

@@ -30,7 +30,7 @@ class HomeController extends Controller
 	public function frame(Request $request,?Collection $old=NULL): \Illuminate\View\View
 	{
 		// If our index was not render from a root url, then redirect to it
-		if (($request->root().'/' !== url()->previous()) && $request->method() === 'POST')
+		if (($request->root().($request->getBasePath() ? '' : '/') !== url()->previous()) && ($request->method() === 'POST'))
 			abort(409);
 
 		$key = request_key($request->get('_key',old('_key',old('dn'))));

public/css/fixes.css

@@ -5,7 +5,7 @@ body {
 */
 
 .logo-src {
-	background: url('/images/logo-h.png');
+	background: url('../images/logo-h.png');
 	width: 152px !important;
 }
 

public/js/custom.js

@@ -13,7 +13,7 @@ function expandChildren(node) {
 
 function getNode(item) {
 	$.ajax({
-		url: '/frame',
+		url: web_base+'/frame',
 		method: 'POST',
 		data: { _key: item },
 		dataType: 'html',
@@ -37,11 +37,27 @@ function getNode(item) {
 				$('.main-content').empty().append(e.responseText);
 				break;
 			case 409:	// Not in root
+				// There is an unusual problem, that location.replace() is not being replaced, when, for example:
+				// * When running in a subpath
+				// * The rendered URL has a slash on the end
+				// * The rendered page is a form, etc /entry/add, and the user clicks on the tree
+				workaround = location.href;
+				location.assign(web_base+'/#'+item);
+
+				if ((web_base_path === '/') && (location.pathname === '/'))
+					location.reload();
+
+				else if ((! location.href.match('/\/$/')) && (workaround !== location.href))
+					location.reload();
+
+				break;
 			case 419:	// Session Expired
-				location.replace('/#'+item);
-				// When the session expires, and we are in the tree, we need to force a reload
-				if (location.pathname === '/')
+				workaround = location.href;
+				location.replace(web_base+'/#'+item);
+
+				if ((! location.href.match('/\/$/')) && (workaround !== location.href))
 					location.reload();
+
 				break;
 			case 500:
 			case 555:	// Missing Method
@@ -59,7 +75,7 @@ $(document).ready(function() {
 	if (typeof basedn !== 'undefined') {
 		sources = basedn;
 	} else {
-		sources = { method: 'POST', url: '/ajax/bases' };
+		sources = { method: 'POST', url: web_base+'/ajax/bases' };
 	}
 
 	// Attach the fancytree widget to an existing <div id="tree"> element
@@ -96,7 +112,7 @@ $(document).ready(function() {
 		lazyLoad: function(event,data) {
 			data.result = {
 				method: 'POST',
-				url: '/ajax/children',
+				url: web_base+'/ajax/children',
 				data: {_key: data.node.data.item,create: true}
 			};
 

resources/themes/architect/views/layouts/partials/htmlheader.blade.php

@@ -6,39 +6,40 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no"/>
 	<meta name="description" content="phpLDAPadmin - A web interface into LDAP data management">
 	<meta name="msapplication-tap-highlight" content="no">
+	<base href="{{ request()->root() }}"/>
 
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">
 
 	<title>{{ config('app.name') }} - @yield('htmlheader_title','🥇 An LDAP Administration Tool')</title>
-	<link rel="shortcut icon" href="/{{ config('app.favicon','favicon.png') }}"/>
+	<link rel="shortcut icon" href="{{ asset(config('app.favicon','favicon.png')) }}"/>
 
 	<!-- App CSS -->
-	<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
+	<link rel="stylesheet" href="{{ asset('css/app.css') }}">
 
 	<!-- Google Font: Source Sans Pro -->
 	<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap">
 
 	<!-- Country Flags -->
-	<link rel="stylesheet" href="{{ asset('/css/flags/flags16-both.css') }}">
-	<link rel="stylesheet" href="{{ asset('/css/flags/flags32-both.css') }}">
+	<link rel="stylesheet" href="{{ asset('css/flags/flags16-both.css') }}">
+	<link rel="stylesheet" href="{{ asset('css/flags/flags32-both.css') }}">
 
 	@if(file_exists('css/fixes.css'))
 		<!-- CSS Fixes -->
-		<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
+		<link rel="stylesheet" href="{{ asset('css/fixes.css') }}">
 	@endif
 
 	@if(file_exists('css/custom.css'))
 		<!-- Custom CSS -->
-		<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
+		<link rel="stylesheet" href="{{ asset('css/custom.css') }}">
 	@endif
 
 	<!-- Page Styles -->
 	@yield('page-styles')
 	{{--
 	@if(file_exists('css/print.css'))
 		<!-- Printing Modifications -->
-		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
+		<link rel="stylesheet" href="{{ asset('css/print.css') }}">
 	@endif
 	--}}
 </head>

resources/themes/architect/views/layouts/partials/scripts.blade.php

@@ -1,8 +1,11 @@
-<script type="text/javascript" src="{{ asset('/js/vendor.js') }}"></script>
-<script type="text/javascript" src="{{ asset('/js/manifest.js') }}"></script>
-<script type="text/javascript" src="{{ asset('/js/app.js') }}"></script>
+<script type="text/javascript" src="{{ asset('js/vendor.js') }}"></script>
+<script type="text/javascript" src="{{ asset('js/manifest.js') }}"></script>
+<script type="text/javascript" src="{{ asset('js/app.js') }}"></script>
 
 <script type="text/javascript">
+	const web_base = '{{ request()->root() }}';
+	const web_base_path = '{{ Request::header('X-Forwarded-Prefix','/') }}'
+
 	// Our CSRF token to each interaction
 	$.ajaxSetup({
 		headers: {

resources/themes/architect/views/layouts/partials/topmenu.blade.php

@@ -229,7 +229,7 @@
 					if (! item.value)
 						return item.name+'=';
 
-					location.replace('/#'+item.value);
+					location.replace(web_base+'/#'+item.value);
 					location.reload();
 					return '';
 				},

resources/views/frames/dn.blade.php

@@ -190,8 +190,9 @@ function editmode() {
 
 		$(document).ready(function() {
 			$('button[id=entry-create]').on('click',function(item) {
-				location.replace('/#{{ Crypt::encryptString(sprintf('*%s|%s','create',$dn)) }}');
-				location.reload();
+				location.replace(web_base+'/#{{ Crypt::encryptString(sprintf('*%s|%s','create',$dn)) }}');
+				if (web_base_path === '/')
+					location.reload();
 			});
 
 			$('button[id=entry-edit]').on('click',function(item) {