mirror of
https://github.com/lkddi/nexusphp.git
synced 2026-04-03 14:10:57 +08:00
middleware Locale use as global
This commit is contained in:
@@ -24,6 +24,7 @@ class Kernel extends HttpKernel
|
|||||||
\App\Http\Middleware\TrimStrings::class,
|
\App\Http\Middleware\TrimStrings::class,
|
||||||
// \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
// \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
||||||
\App\Http\Middleware\BootNexus::class,
|
\App\Http\Middleware\BootNexus::class,
|
||||||
|
Locale::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -40,7 +41,6 @@ class Kernel extends HttpKernel
|
|||||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
||||||
\App\Http\Middleware\VerifyCsrfToken::class,
|
\App\Http\Middleware\VerifyCsrfToken::class,
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
||||||
Locale::class,
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'api' => [
|
'api' => [
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ class Locale
|
|||||||
$locale = $user->locale;
|
$locale = $user->locale;
|
||||||
do_log("locale from user: {$user->id}, set locale: $locale");
|
do_log("locale from user: {$user->id}, set locale: $locale");
|
||||||
} else {
|
} else {
|
||||||
$locale = self::getLocaleFromCookie() ?? 'en';
|
$locale = self::getLocaleFromCookie() ?? self::getDefault();
|
||||||
do_log("locale from cookie, set locale: $locale");
|
do_log("locale from cookie, set locale: $locale");
|
||||||
}
|
}
|
||||||
App::setLocale($locale);
|
App::setLocale($locale);
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ if ($langid)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
require_once(get_langfile_path("", false, $CURLANGDIR));
|
require_once(get_langfile_path("", false, $CURLANGDIR));
|
||||||
require_once(get_langfile_path("takesignup.php", false, $CURLANGDIR));
|
|
||||||
cur_user_check ();
|
cur_user_check ();
|
||||||
$type = $_GET['type'] ?? '';
|
$type = $_GET['type'] ?? '';
|
||||||
$isPreRegisterEmailAndUsername = get_setting("system.is_invite_pre_email_and_username") == "yes";
|
$isPreRegisterEmailAndUsername = get_setting("system.is_invite_pre_email_and_username") == "yes";
|
||||||
@@ -94,9 +93,9 @@ if ($isPreRegisterEmailAndUsername && !empty($inv["pre_register_email"])) {
|
|||||||
?>
|
?>
|
||||||
<tr><td class=rowhead><?php echo $lang_signup['row_desired_username'] ?></td><td class=rowfollow align=left><?php echo $usernameInput?><br />
|
<tr><td class=rowhead><?php echo $lang_signup['row_desired_username'] ?></td><td class=rowfollow align=left><?php echo $usernameInput?><br />
|
||||||
<font class=small><?php echo $lang_signup['text_allowed_characters'] ?></font></td></tr>
|
<font class=small><?php echo $lang_signup['text_allowed_characters'] ?></font></td></tr>
|
||||||
<tr><td class=rowhead><?php echo $lang_signup['row_pick_a_password'] ?></td><td class=rowfollow align=left><input type="password" style="width: 200px" class="wantpassword" data-too-short="<?php echo $lang_takesignup['std_password_too_short']?>" data-too-long="<?php echo $lang_takesignup['std_password_too_long']?>" data-equals-username="<?php echo $lang_takesignup['std_password_equals_username']?>"/><br />
|
<tr><td class=rowhead><?php echo $lang_signup['row_pick_a_password'] ?></td><td class=rowfollow align=left><input type="password" style="width: 200px" class="wantpassword"/><br />
|
||||||
<font class=small><?php echo $lang_signup['text_minimum_six_characters'] ?></font></td></tr>
|
<font class=small><?php echo $lang_signup['text_minimum_six_characters'] ?></font></td></tr>
|
||||||
<tr><td class=rowhead><?php echo $lang_signup['row_enter_password_again'] ?></td><td class=rowfollow align=left><input type="password" style="width: 200px" class="passagain" data-tip="<?php echo $lang_takesignup['std_passwords_unmatched']?>"/></td></tr>
|
<tr><td class=rowhead><?php echo $lang_signup['row_enter_password_again'] ?></td><td class=rowfollow align=left><input type="password" style="width: 200px" class="passagain" /></td></tr>
|
||||||
<?php
|
<?php
|
||||||
show_image_code ();
|
show_image_code ();
|
||||||
?>
|
?>
|
||||||
|
|||||||
@@ -856,7 +856,7 @@ EOD;
|
|||||||
if ($privacyupdated == 1)
|
if ($privacyupdated == 1)
|
||||||
$to .= "&privacy=1";
|
$to .= "&privacy=1";
|
||||||
clear_user_cache($CURUSER["id"]);
|
clear_user_cache($CURUSER["id"]);
|
||||||
\Nexus\Database\NexusDB::cache_get(get_challenge_key($userInfo->username));
|
\Nexus\Database\NexusDB::cache_del(get_challenge_key($userInfo->username));
|
||||||
header("Location: $to");
|
header("Location: $to");
|
||||||
}
|
}
|
||||||
stdhead($lang_usercp['head_control_panel'].$lang_usercp['head_security_settings']);
|
stdhead($lang_usercp['head_control_panel'].$lang_usercp['head_security_settings']);
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ use App\Enums\Permission\PermissionEnum;
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Route::group(['middleware' => ['auth:sanctum', 'locale']], function () {
|
Route::group(['middleware' => ['auth:sanctum']], function () {
|
||||||
|
|
||||||
Route::group(['middleware' => ['user']], function () {
|
Route::group(['middleware' => ['user']], function () {
|
||||||
Route::post('logout', [\App\Http\Controllers\AuthenticateController::class, 'logout']);
|
Route::post('logout', [\App\Http\Controllers\AuthenticateController::class, 'logout']);
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
use Illuminate\Support\Facades\Route;
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::group(['middleware' => ['auth.nexus:passkey', 'locale']], function () {
|
Route::group(['middleware' => ['auth.nexus:passkey']], function () {
|
||||||
Route::post("pieces-hash", [\App\Http\Controllers\TorrentController::class, "queryByPiecesHash"])->name("torrent.pieces_hash.query");
|
Route::post("pieces-hash", [\App\Http\Controllers\TorrentController::class, "queryByPiecesHash"])->name("torrent.pieces_hash.query");
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ Route::get('/', function () {
|
|||||||
return redirect('index.php');
|
return redirect('index.php');
|
||||||
});
|
});
|
||||||
|
|
||||||
Route::group(['prefix' => 'web', 'middleware' => ['auth.nexus:nexus-web', 'locale']], function () {
|
Route::group(['prefix' => 'web', 'middleware' => ['auth.nexus:nexus-web']], function () {
|
||||||
Route::get('torrent-approval-page', [\App\Http\Controllers\TorrentController::class, 'approvalPage']);
|
Route::get('torrent-approval-page', [\App\Http\Controllers\TorrentController::class, 'approvalPage']);
|
||||||
Route::get('torrent-approval-logs', [\App\Http\Controllers\TorrentController::class, 'approvalLogs']);
|
Route::get('torrent-approval-logs', [\App\Http\Controllers\TorrentController::class, 'approvalLogs']);
|
||||||
Route::post('torrent-approval', [\App\Http\Controllers\TorrentController::class, 'approval']);
|
Route::post('torrent-approval', [\App\Http\Controllers\TorrentController::class, 'approval']);
|
||||||
|
|||||||
Reference in New Issue
Block a user