From 8ab5b4f35c749ccf68541bf2b7f5c50ab6533eac Mon Sep 17 00:00:00 2001 From: Deon George Date: Fri, 14 Mar 2025 17:12:24 +1100 Subject: [PATCH] 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 | 24 ------------------- app/Http/Middleware/ApplicationSession.php | 1 + .../architect/views/auth/login.blade.php | 2 +- .../layouts/partials/sidebarmenu.blade.php | 2 +- resources/views/frames/create.blade.php | 4 ++-- resources/views/frames/dn.blade.php | 2 +- resources/views/frames/import.blade.php | 2 +- .../views/frames/import_result.blade.php | 2 +- resources/views/frames/info.blade.php | 6 ++--- routes/web.php | 6 ++--- 10 files changed, 14 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b79458f3..c11cc4b5 100644 --- a/app/Http/Controllers/HomeController.php +++ b/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 * diff --git a/app/Http/Middleware/ApplicationSession.php b/app/Http/Middleware/ApplicationSession.php index 00d0a2cf..a57f6877 100644 --- a/app/Http/Middleware/ApplicationSession.php +++ b/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); diff --git a/resources/themes/architect/views/auth/login.blade.php b/resources/themes/architect/views/auth/login.blade.php index eeda31be..8337bf11 100644 --- a/resources/themes/architect/views/auth/login.blade.php +++ b/resources/themes/architect/views/auth/login.blade.php @@ -22,7 +22,7 @@

- @lang('Sign in to') {{ config('server')->name }} + @lang('Sign in to') {{ $server->name }}

diff --git a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php index a2ec3de7..57172080 100644 --- a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php +++ b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php @@ -32,7 +32,7 @@
    -
  • {{ config('server')->name }}
    • +
  • {{ $server->name }}
  • diff --git a/resources/views/frames/create.blade.php b/resources/views/frames/create.blade.php index ebdf36a8..b8fac6d9 100644 --- a/resources/views/frames/create.blade.php +++ b/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])" diff --git a/resources/views/frames/dn.blade.php b/resources/views/frames/dn.blade.php index 18f3c81f..f5202855 100644 --- a/resources/views/frames/dn.blade.php +++ b/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') diff --git a/resources/views/frames/import.blade.php b/resources/views/frames/import.blade.php index 700bb1d4..cb110b42 100644 --- a/resources/views/frames/import.blade.php +++ b/resources/views/frames/import.blade.php @@ -4,7 +4,7 @@ - +
    		@lang('LDIF Import')
    @lang('To Server') {{ config('server')->name }}    		@lang('LDIF Import')
    @lang('To Server') {{ $server->name }}
    @endsection diff --git a/resources/views/frames/import_result.blade.php b/resources/views/frames/import_result.blade.php index 4835dc06..48641ef9 100644 --- a/resources/views/frames/import_result.blade.php +++ b/resources/views/frames/import_result.blade.php @@ -2,7 +2,7 @@ - +
    		@lang('LDIF Import Result')
    @lang('To Server') {{ config('server')->name }}    		@lang('LDIF Import Result')
    @lang('To Server') {{ $server->name }}
    @endsection diff --git a/resources/views/frames/info.blade.php b/resources/views/frames/info.blade.php index b77128c2..003d0382 100644 --- a/resources/views/frames/info.blade.php +++ b/resources/views/frames/info.blade.php @@ -4,7 +4,7 @@ - +
    		@lang('Server Info')
    {{ $s->rootDSE()->entryuuid[0] ?? '' }}    		@lang('Server Info')
    {{ $server->rootDSE()->entryuuid[0] ?? '' }}
    @endsection @@ -13,10 +13,10 @@
    - @foreach ($s->rootDSE()->getObjects() as $attribute => $ao) + @foreach ($server->rootDSE()->getObjects() as $attribute => $ao) diff --git a/routes/web.php b/routes/web.php index 26ec1c67..6d625d76 100644 --- a/routes/web.php +++ b/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::get('debug','debug'); + Route::view('info','frames.info'); + 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() {
    - {!! ($x=$s->schema('attributetypes',$attribute)) + {!! ($x=$server->schema('attributetypes',$attribute)) ? sprintf('%s',$x->name_lc,url('schema/attributetypes',$x->name_lc),$x->name) : $attribute !!}