Skip to content

Commit

Permalink
🧑‍💻 👽️ anpassung wegen neuer richtlinien
Browse files Browse the repository at this point in the history
laravel möchte local statt development für lokale entwiclung
  • Loading branch information
P1tt187 committed Jun 18, 2023
1 parent e727fd5 commit 7488a86
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/Http/Controllers/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ public function doLogin()
}

private function attemtLoginViaDevelop(Request $request){
if (!App::environment('development')) {
if (!(App::environment('development') || App::environment('local'))) {
return false;
}
$userGroup = request('userGroup');
Expand Down
6 changes: 3 additions & 3 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public function boot()
Schema::defaultStringLength(191);

Blade::if('dev', function() {
return App::environment('development');
return App::environment('development') || App::environment('local');
});

Blade::if('berta', function() {
Expand Down Expand Up @@ -78,7 +78,7 @@ public function boot()
($user->getSectionsIdForRoles(RoleUtility::PRIVILEGE_CL)
->contains($editUser->section_id)
&& (strpos(env('LDAP_SECTIONS', ''), $editUser->section->title) == false
|| \App::environment('development'))
|| (\App::environment('development') || \App::environment('local')))
);
});

Expand All @@ -99,7 +99,7 @@ public function boot()
return true;
}
return strpos(env('LDAP_SECTIONS', ''), $user->section->title) == false
|| \App::environment('development');
|| \App::environment('development') || \App::environment('local');
});

Blade::if('ldapSection', function($section) {
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layouts/master.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{{--
<link rel="stylesheet" type="text/css" href="{{ mix('/static.css') }}">
--}}
@if (App::environment('development'))
@if (App::environment('development') || App::environment('local'))
<link rel="shortcut icon" type="image/png" href="{{ asset('/favicon-demo-48x48.png') }}">
@elseif (App::environment('berta'))
<link rel="shortcut icon" type="image/png" href="{{ asset('/favicon-berta-48x48.png') }}">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/partials/navigation.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class="navbar-toggler collapsed btn btn-primary"

{{-- LARA LOGO --}}
<a class="navbar-brand" href="{{ asset('/') }}">
@if (App::environment('development'))
@if (App::environment('development') || App::environment('local'))
<img id="nav-logo-field" src="{{ asset('/logos/lara-logo-dev.png') }}" height="48" alt="LARA dev">
@elseif (App::environment('berta'))
<img id="nav-logo-field" src="{{ asset('/logos/lara-logo-berta.png') }}" height="48" alt="BERTA">
Expand Down

0 comments on commit 7488a86

Please sign in to comment.