Commit 2426af7d authored by Yassine Doghri's avatar Yassine Doghri
Browse files

fix(install): redirect to input baseUrl after instance config 

install was redirecting to default baseUrl because `redirect->back()` uses the `site_url()` function

fix #53
parent 419604c4

app/Controllers/Install.php

+10 −2
Original line number Diff line number Diff line
@@ -163,13 +163,21 @@ class Install extends Controller 
                ->with('errors', $this->validator->getErrors());

        }



        $baseUrl = $this->request->getPost('hostname');

        self::writeEnv([

            'app.baseURL' => $this->request->getPost('hostname'),

            'app.baseURL' => $baseUrl,

            'app.adminGateway' => $this->request->getPost('admin_gateway'),

            'app.authGateway' => $this->request->getPost('auth_gateway'),

        ]);



        return redirect()->back();

        helper('text');



        // redirect to full install url with new baseUrl input

        return redirect(0)->to(

            reduce_double_slashes(

                $baseUrl . '/' . config('App')->installGateway

            )

        );

    }



    public function databaseConfig()

app/Views/install/instance_config.php

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    'id' => 'hostname',

    'name' => 'hostname',

    'class' => 'form-input mb-4',

    'value' => old('hostname', set_value(host_url(), config('App')->baseURL)),

    'value' => old('hostname', host_url() ?? config('App')->baseURL),

    'required' => 'required',

]) ?>