Move direct controller direct view calls to route/web, add global $server to use in views, negating the need to use config('server')

app/Http/Controllers/HomeController.php

@@ -41,14 +41,6 @@ class HomeController extends Controller
 		});
 	}
 
-	/**
-	 * Debug Page
-	 */
-	public function debug()
-	{
-		return view('debug');
-	}
-
 	/**
 	 * Create a new object in the LDAP server
 	 *
@@ -451,22 +443,6 @@ class HomeController extends Controller
 			->with('ldif',htmlspecialchars($x));
 	}
 
-	public function import_frame()
-	{
-		return view('frames.import');
-	}
-
-	/**
-	 * LDAP Server INFO
-	 *
-	 * @return \Illuminate\View\View
-	 */
-	public function info(): \Illuminate\View\View
-	{
-		return view('frames.info')
-			->with('s',config('server'));
-	}
-
 	/**
 	 * For any incoming request, work out the command and DN involved
 	 *

app/Http/Middleware/ApplicationSession.php

@@ -25,6 +25,7 @@ class ApplicationSession
 	{
 		Config::set('server',new Server);
 
+		view()->share('server', Config::get('server'));
 		view()->share('user', auth()->user() ?: new User);
 
 		return $next($request);

resources/themes/architect/views/auth/login.blade.php

@@ -22,7 +22,7 @@
 										<div class="h5 modal-title text-center">
 											<h4 class="mt-2">
 												<div class="app-logo mx-auto mb-3"><img class="w-75" src="{{ url('images/logo-h-lg.png') }}"></div>
-												<small>@lang('Sign in to') <strong>{{ config('server')->name }}</strong></small>
+												<small>@lang('Sign in to') <strong>{{ $server->name }}</strong></small>
 											</h4>
 										</div>
 

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

@@ -32,7 +32,7 @@
 	<div class="scrollbar-sidebar">
 		<div class="app-sidebar__inner">
 			<ul class="vertical-nav-menu">
-				<li class="app-sidebar__heading">{{ config('server')->name }}</li>
+				<li class="app-sidebar__heading">{{ $server->name }}</li>
 				<li>
 					<i id="treeicon" class="metismenu-icon fa-fw fas fa-sitemap"></i>
 					<span class="f16" id="tree"></span>

resources/views/frames/create.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.dn')
 
 @section('page_title')
-	@include('fragment.dn.header',['o'=>($oo=config('server')->fetch(old('container',$container)))])
+	@include('fragment.dn.header',['o'=>($oo=$server->fetch(old('container',$container)))])
 @endsection
 
 @section('main-content')
@@ -30,7 +30,7 @@
 											id="objectclass"
 											name="objectclass[]"
 											:label="__('Select a Structural ObjectClass...')"
-											:options="($oc=config('server')->schema('objectclasses'))
+											:options="($oc=$server->schema('objectclasses'))
 												->filter(fn($item)=>$item->isStructural())
 												->sortBy(fn($item)=>$item->name_lc)
 												->map(fn($item)=>['id'=>$item->name,'value'=>$item->name])"

resources/views/frames/dn.blade.php

@@ -1,7 +1,7 @@
 @extends('layouts.dn')
 
 @section('page_title')
-	@include('fragment.dn.header',['o'=>($o ?? $o=config('server')->fetch($dn))])
+	@include('fragment.dn.header',['o'=>($o ?? $o=$server->fetch($dn))])
 @endsection
 
 @section('main-content')

resources/views/frames/import.blade.php

@@ -4,7 +4,7 @@
 	<table class="table table-borderless">
 		<tr>
 			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
-			<td class="top text-start align-text-top p-2"><strong>@lang('LDIF Import')</strong><br><small>@lang('To Server') <strong>{{ config('server')->name }}</strong></small></td>
+			<td class="top text-start align-text-top p-2"><strong>@lang('LDIF Import')</strong><br><small>@lang('To Server') <strong>{{ $server->name }}</strong></small></td>
 		</tr>
 	</table>
 @endsection

resources/views/frames/import_result.blade.php

@@ -2,7 +2,7 @@
 	<table class="table table-borderless">
 		<tr>
 			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-upload"></i></div></td>
-			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import Result')</strong><br><small>@lang('To Server') <strong>{{ config('server')->name }}</strong></small></td>
+			<td class="top text-start align-text-top p-0 pt-2"><strong>@lang('LDIF Import Result')</strong><br><small>@lang('To Server') <strong>{{ $server->name }}</strong></small></td>
 		</tr>
 	</table>
 @endsection

resources/views/frames/info.blade.php

@@ -4,7 +4,7 @@
 	<table class="table table-borderless">
 		<tr>
 			<td style="border-radius: 5px;"><div class="page-title-icon f32"><i class="fas fa-info"></i></div></td>
-			<td class="top text-end align-text-top p-2"><strong>@lang('Server Info')</strong><br><small>{{ $s->rootDSE()->entryuuid[0] ?? '' }}</small></td>
+			<td class="top text-end align-text-top p-2"><strong>@lang('Server Info')</strong><br><small>{{ $server->rootDSE()->entryuuid[0] ?? '' }}</small></td>
 		</tr>
 	</table>
 @endsection
@@ -13,10 +13,10 @@
 	<div class="main-card mb-3 card">
 		<div class="card-body">
 			<table class="table">
-				@foreach ($s->rootDSE()->getObjects() as $attribute => $ao)
+				@foreach ($server->rootDSE()->getObjects() as $attribute => $ao)
 					<tr>
 						<th class="w-25">
-							{!! ($x=$s->schema('attributetypes',$attribute))
+							{!! ($x=$server->schema('attributetypes',$attribute))
 								? sprintf('<a class="attributetype" id="strtolower(%s)" href="%s">%s</a>',$x->name_lc,url('schema/attributetypes',$x->name_lc),$x->name)
 								: $attribute !!}
 						</th>

routes/web.php

@@ -31,10 +31,10 @@ Route::get('logout',[LoginController::class,'logout']);
 Route::controller(HomeController::class)->group(function() {
 	Route::middleware(AllowAnonymous::class)->group(function() {
 		Route::get('/','home');
-		Route::get('info','info');
+		Route::view('info','frames.info');
-		Route::get('debug','debug');
+		Route::view('debug','debug');
 		Route::post('frame','frame');
-		Route::get('import','import_frame');
+		Route::view('import','frames.import');
 		Route::get('schema','schema_frame');
 
 		Route::group(['prefix'=>'user'],function() {