Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Actions/Fortify/UpdateUserProfileInformation.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function update($user, array $input)
$user->updateCoverImage($input['cover_image']);
}

if (array_key_exists('email', $input) && $input['email'] !== $user->email &&
if (array_key_exists('email', $input) && !empty($input['email']) && $input['email'] !== $user->email &&
$user instanceof MustVerifyEmail) {
$this->updateVerifiedUser($user, $input);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public function update(Request $request, GeneralSettings $settings): \Illuminate
{
$request->validate([
'site_name' => 'required|string|max:50',
'copyright_name' => 'nullable|string|max:50',
'copyright_url' => 'nullable|url|max:255',
'enable_mcserver_onlineplayersbox' => 'required|boolean',
'enable_mcserver_statuspingbox' => 'required|boolean',
'enable_ingamechat' => 'required|boolean',
Expand Down Expand Up @@ -64,6 +66,8 @@ public function update(Request $request, GeneralSettings $settings): \Illuminate
'enable_topplayersbox' => 'required|boolean',
]);
$settings->site_name = $request->input('site_name');
$settings->copyright_name = $request->input('copyright_name') ?? null;
$settings->copyright_url = $request->input('copyright_url') ?? null;
$settings->enable_mcserver_onlineplayersbox = $request->input('enable_mcserver_onlineplayersbox');
$settings->enable_mcserver_statuspingbox = $request->input('enable_mcserver_statuspingbox');
$settings->enable_ingamechat = $request->input('enable_ingamechat');
Expand Down
2 changes: 2 additions & 0 deletions app/Settings/GeneralSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
class GeneralSettings extends Settings
{
public ?string $site_name;
public ?string $copyright_name;
public ?string $copyright_url;
public ?string $site_header_logo_path_light;
public ?string $site_header_logo_path_dark;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

use Spatie\LaravelSettings\Migrations\SettingsMigration;

return new class extends SettingsMigration
{
public function up(): void
{
$this->migrator->add('general.copyright_name', null);
$this->migrator->add('general.copyright_url', null);
}

public function down(): void
{
$this->migrator->deleteIfExists('general.copyright_name');
$this->migrator->deleteIfExists('general.copyright_url');
}
};
3,474 changes: 1,746 additions & 1,728 deletions lang/ru.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/default/assets/ActionMessage-BO0_aC8X.js

This file was deleted.

4 changes: 0 additions & 4 deletions public/build/default/assets/AdminLayout-DqDQ7E1m.js

This file was deleted.

7 changes: 0 additions & 7 deletions public/build/default/assets/AfterCreateSteps-tl5rvQls.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/default/assets/AlertCard-Q7XC6UCi.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/default/assets/ApiTokenManager-B3D6zOdO.js

This file was deleted.

Loading
Loading