diff --git a/app/Http/Controllers/Admin/AdminSiteController.php b/app/Http/Controllers/Admin/AdminSiteController.php index b795a8683..73138c404 100644 --- a/app/Http/Controllers/Admin/AdminSiteController.php +++ b/app/Http/Controllers/Admin/AdminSiteController.php @@ -164,7 +164,7 @@ class AdminSiteController extends BasePageController $this->smarty->assign('themelist', Utility::getThemesList()); - if (! str_contains(env('NNTP_SERVER'), 'astra')) { + if (! str_contains(config('settings.nntp_server'), 'astra')) { $this->smarty->assign('compress_headers_warning', 'compress_headers_warning'); } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index c99bec007..5d0a1a945 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -232,7 +232,7 @@ class RegisterController extends Controller app('smarty.view')->assign('invite_code_query', $this->inviteCodeQuery); $theme = Settings::settingValue('site.main.style'); - $nocaptcha = env('NOCAPTCHA_ENABLED'); + $nocaptcha = config('settings.nocaptcha_enabled'); $meta_title = 'Register'; $meta_keywords = 'register,signup,registration'; diff --git a/app/Http/Controllers/BtcPaymentController.php b/app/Http/Controllers/BtcPaymentController.php index 2fcfff919..8a88b449f 100644 --- a/app/Http/Controllers/BtcPaymentController.php +++ b/app/Http/Controllers/BtcPaymentController.php @@ -15,8 +15,8 @@ class BtcPaymentController extends BasePageController public function show(Request $request): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse { $this->setPreferences(); - $gateway_id = env('MYCELIUM_GATEWAY_ID'); - $gateway_secret = env('MYCELIUM_GATEWAY_SECRET'); + $gateway_id = config('settings.mycelium_gateway_id'); + $gateway_secret = config('settings.mycelium_gateway_secret'); $action = $request->input('action') ?? 'view'; $donation = Role::query()->where('donation', '>', 0)->get(['id', 'name', 'donation', 'addyears']); @@ -63,8 +63,8 @@ class BtcPaymentController extends BasePageController */ public function callback(): void { - $gateway_id = env('MYCELIUM_GATEWAY_ID'); - $gateway_secret = env('MYCELIUM_GATEWAY_SECRET'); + $gateway_id = config('settings.mycelium_gateway_id'); + $gateway_secret = config('settings.mycelium_gateway_secret'); $geary = new Geary($gateway_id, $gateway_secret); $order = $geary->check_order_callback(); diff --git a/config/settings.php b/config/settings.php new file mode 100644 index 000000000..2a2fbe20e --- /dev/null +++ b/config/settings.php @@ -0,0 +1,8 @@ + env('MYCELIUM_GATEWAY_ID'), + 'mycelium_gateway_secret' => env('MYCELIUM_GATEWAY_SECRET'), + 'nntp_server' => env('NNTP_SERVER'), + 'nocaptcha_enabled' => env('NOCAPTCHA_ENABLED'), +];