Skynet/misc_pterodactyl-panel
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace settings repository

Browse source
This commit is contained in:
Lance Pioch 2022-10-24 01:03:53 -04:00
parent e49ba65709
commit e5d5d7de4d
8 changed files with 76 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Admin/Settings/AdvancedController.php
View file

@ -7,10 +7,12 @@ use Illuminate\Http\RedirectResponse;
use Prologue\Alerts\AlertsMessageBag;
use Illuminate\Contracts\Console\Kernel;
use Illuminate\View\Factory as ViewFactory;
use Pterodactyl\Exceptions\Model\DataValidationException;
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
use Pterodactyl\Http\Requests\Admin\Settings\AdvancedSettingsFormRequest;
use Pterodactyl\Models\Setting;
class AdvancedController extends Controller
{
@ -21,7 +23,6 @@ class AdvancedController extends Controller
private AlertsMessageBag $alert,
private ConfigRepository $config,
private Kernel $kernel,
private SettingsRepositoryInterface $settings,
private ViewFactory $view
) {
}
@ -45,13 +46,13 @@ class AdvancedController extends Controller
}
/**
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @throws DataValidationException
* @throws RecordNotFoundException
*/
public function update(AdvancedSettingsFormRequest $request): RedirectResponse
{
foreach ($request->normalize() as $key => $value) {
$this->settings->set('settings::' . $key, $value);
Setting::set('settings::' . $key, $value);
}
$this->kernel->call('queue:restart');

11
app/Http/Controllers/Admin/Settings/IndexController.php
View file

@ -3,6 +3,7 @@
namespace Pterodactyl\Http\Controllers\Admin\Settings;
use Illuminate\View\View;
use Pterodactyl\Models\Setting;
use Illuminate\Http\RedirectResponse;
use Prologue\Alerts\AlertsMessageBag;
use Illuminate\Contracts\Console\Kernel;
@ -10,7 +11,8 @@ use Illuminate\View\Factory as ViewFactory;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Traits\Helpers\AvailableLanguages;
use Pterodactyl\Services\Helpers\SoftwareVersionService;
use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
use Pterodactyl\Exceptions\Model\DataValidationException;
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
use Pterodactyl\Http\Requests\Admin\Settings\BaseSettingsFormRequest;
class IndexController extends Controller
@ -23,7 +25,6 @@ class IndexController extends Controller
public function __construct(
private AlertsMessageBag $alert,
private Kernel $kernel,
private SettingsRepositoryInterface $settings,
private SoftwareVersionService $versionService,
private ViewFactory $view
) {
@ -43,13 +44,13 @@ class IndexController extends Controller
/**
* Handle settings update.
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
* @throws DataValidationException
* @throws RecordNotFoundException
*/
public function update(BaseSettingsFormRequest $request): RedirectResponse
{
foreach ($request->normalize() as $key => $value) {
$this->settings->set('settings::' . $key, $value);
Setting::set('settings::' . $key, $value);
}
$this->kernel->call('queue:restart');

5
app/Http/Controllers/Admin/Settings/MailController.php
View file

@ -7,6 +7,7 @@ use Illuminate\View\View;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Contracts\Console\Kernel;
use Pterodactyl\Models\Setting;
use Pterodactyl\Notifications\MailTested;
use Illuminate\View\Factory as ViewFactory;
use Illuminate\Support\Facades\Notification;
@ -15,7 +16,6 @@ use Pterodactyl\Http\Controllers\Controller;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Providers\SettingsServiceProvider;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
use Pterodactyl\Contracts\Repository\SettingsRepositoryInterface;
use Pterodactyl\Http\Requests\Admin\Settings\MailSettingsFormRequest;
class MailController extends Controller
@ -27,7 +27,6 @@ class MailController extends Controller
private ConfigRepository $config,
private Encrypter $encrypter,
private Kernel $kernel,
private SettingsRepositoryInterface $settings,
private ViewFactory $view
) {
}
@ -66,7 +65,7 @@ class MailController extends Controller
$value = $this->encrypter->encrypt($value);
}
$this->settings->set('settings::' . $key, $value);
Setting::set('settings::' . $key, $value);
}
$this->kernel->call('queue:restart');