parent
9677a902ea
commit
66136547c5
|
|
@ -54,7 +54,6 @@ class Kernel extends HttpKernel
|
|||
'installer' => [
|
||||
\App\Http\Middleware\EncryptCookies::class,
|
||||
\Illuminate\Session\Middleware\StartSession::class,
|
||||
\App\Http\Middleware\SetLocaleInstaller::class,
|
||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ class SetLocaleInstaller
|
|||
*/
|
||||
public function handle(Request $request, Closure $next)
|
||||
{
|
||||
$sessionLocale = session('locale');
|
||||
$locale = $_COOKIE['locale'] ?? 'en';
|
||||
$languageDir = base_path('beike/Installer/Lang');
|
||||
$languages = array_values(array_diff(scandir($languageDir), array('..', '.')));
|
||||
|
||||
if ($sessionLocale && in_array($sessionLocale, $languages)) {
|
||||
App::setLocale($sessionLocale);
|
||||
if ($locale && in_array($locale, $languages)) {
|
||||
App::setLocale($locale);
|
||||
} else {
|
||||
App::setLocale('en');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class WelcomeController extends Controller
|
|||
public function locale($lang)
|
||||
{
|
||||
if (in_array($lang, languages()->toArray())) {
|
||||
Session::put('locale', $lang);
|
||||
setcookie('locale', $lang, 0, '/');
|
||||
}
|
||||
return Redirect::back();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,18 +6,23 @@ use Beike\Installer\Controllers\FinalController;
|
|||
use Beike\Installer\Controllers\PermissionsController;
|
||||
use Beike\Installer\Controllers\RequirementsController;
|
||||
use Beike\Installer\Controllers\WelcomeController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
|
||||
Route::prefix('installer')
|
||||
->name('installer.')
|
||||
->middleware(['installer'])
|
||||
->middleware(\App\Http\Middleware\SetLocaleInstaller::class)
|
||||
->group(function () {
|
||||
Route::get('/', [WelcomeController::class, 'index'])->name('welcome');
|
||||
Route::get('lang/{lang}', [WelcomeController::class, 'locale'])->name('lang.switch');
|
||||
Route::get('requirements', [RequirementsController::class, 'index'])->name('requirements');
|
||||
Route::get('permissions', [PermissionsController::class, 'index'])->name('permissions');
|
||||
Route::get('environment', [EnvironmentController::class, 'index'])->name('environment');
|
||||
Route::post('environment/save', [EnvironmentController::class, 'saveWizard'])->name('environment.save');
|
||||
Route::get('database', [DatabaseController::class, 'index'])->name('database');
|
||||
Route::get('final', [FinalController::class, 'index'])->name('final');
|
||||
Route::middleware(['installer'])
|
||||
->group(function () {
|
||||
Route::get('lang/{lang}', [WelcomeController::class, 'locale'])->name('lang.switch');
|
||||
Route::get('environment', [EnvironmentController::class, 'index'])->name('environment');
|
||||
Route::post('environment/save', [EnvironmentController::class, 'saveWizard'])->name('environment.save');
|
||||
Route::get('database', [DatabaseController::class, 'index'])->name('database');
|
||||
Route::get('final', [FinalController::class, 'index'])->name('final');
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -36,12 +36,12 @@
|
|||
<select name="database_connection" class="form-select" aria-label="Default select example">
|
||||
<option value="mysql" selected>
|
||||
{{ trans($entry_key . 'db_connection_label_mysql') }}</option>
|
||||
<option value="sqlite">
|
||||
{{ trans($entry_key . 'db_connection_label_sqlite') }}</option>
|
||||
<option value="pgsql">
|
||||
{{ trans($entry_key . 'db_connection_label_pgsql') }}</option>
|
||||
<option value="sqlsrv">
|
||||
{{ trans($entry_key . 'db_connection_label_sqlsrv') }}</option>
|
||||
{{-- <option value="sqlite">--}}
|
||||
{{-- {{ trans($entry_key . 'db_connection_label_sqlite') }}</option>--}}
|
||||
{{-- <option value="pgsql">--}}
|
||||
{{-- {{ trans($entry_key . 'db_connection_label_pgsql') }}</option>--}}
|
||||
{{-- <option value="sqlsrv">--}}
|
||||
{{-- {{ trans($entry_key . 'db_connection_label_sqlsrv') }}</option>--}}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
use Illuminate\Contracts\Http\Kernel;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
if (version_compare(PHP_VERSION, '8.0.2', '<') == true) {
|
||||
exit('PHP8.0.2+ Required');
|
||||
}
|
||||
|
||||
define('LARAVEL_START', microtime(true));
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in New Issue