Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

asd?

Browse Source
This commit is contained in:
Andras Bacsai 2023-05-26 14:05:58 +02:00
parent 97b336bff4
commit 820e432f92
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Middleware/TrustProxies.php
View File

@ -12,7 +12,7 @@ class TrustProxies extends Middleware
* *
* @var array<int, string>|string|null * @var array<int, string>|string|null
*/ */
protected $proxies; protected $proxies = '*';
/** /**
* The headers that should be used to detect proxies. * The headers that should be used to detect proxies.
@ -20,7 +20,7 @@ class TrustProxies extends Middleware
* @var int * @var int
*/ */
protected $headers = protected $headers =
Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_PROTO |

20
app/Providers/AppServiceProvider.php
View File

@ -24,15 +24,15 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot(): void public function boot(): void
{ {
if ($this->app->environment('production')) { // if ($this->app->environment('production')) {
try { // try {
$settings = InstanceSettings::first(); // $settings = InstanceSettings::first();
if (Str::startsWith($settings->fqdn, 'https')) { // if (Str::startsWith($settings->fqdn, 'https')) {
URL::forceScheme('https'); // URL::forceScheme('https');
} // }
} catch (\Exception $e) { // } catch (\Exception $e) {
// do nothing // // do nothing
} // }
} // }
} }
} }

5
bootstrap/helpers/shared.php
View File

@ -1,11 +1,16 @@
<?php <?php
use App\Models\InstanceSettings;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use Visus\Cuid2\Cuid2; use Visus\Cuid2\Cuid2;
use Illuminate\Support\Str; use Illuminate\Support\Str;
function is_https()
{
return Str::of(InstanceSettings::get()->fqdn)->startsWith('https');
}
function general_error_handler(\Throwable $e, $that = null, $isJson = false) function general_error_handler(\Throwable $e, $that = null, $isJson = false)
{ {
try { try {

6
resources/views/components/layout.blade.php
View File

@ -25,6 +25,11 @@
</head> </head>
<body> <body>
{{-- @if (is_https())
<script>
console.log('asd')
</script>
@else --}}
@livewireScripts @livewireScripts
@auth @auth
<x-navbar /> <x-navbar />
@ -60,6 +65,7 @@
}) })
</script> </script>
@endauth @endauth
{{-- @endif --}}
</body> </body>