StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1909 from pterodactyl/enhancement/new-server-admin

Browse source 
Enhancements to new server admin
This commit is contained in:
Dane Everitt 2020-04-12 10:13:03 -07:00 • committed by GitHub
commit 72c144e309
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 317 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

4
database/migrations/2017_10_02_202000_ChangeServicesToUseAMoreUniqueIdentifier.php
View file

@ -26,8 +26,8 @@ class ChangeServicesToUseAMoreUniqueIdentifier extends Migration
DB::table('services')->get(['id', 'author', 'uuid'])->each(function ($service) {
DB::table('services')->where('id', $service->id)->update([
'author' => ($service->author === 'ptrdctyl-v040-11e6-8b77-86f30ca893d3') ? 'support@pterodactyl.io' : 'unknown@unknown-author.com',
'uuid' => Uuid::uuid4()->toString(),
'author' => ($service->author === 'ptrdctyl-v040-11e6-8b77-86f30ca893d3') ? 'support@pterodactyl.io' : 'unknown@unknown-author.com',
'uuid' => Uuid::uuid4()->toString(),
]);
});

4
database/migrations/2020_03_22_163911_merge_permissions_table_into_subusers.php
View file

@ -44,12 +44,12 @@ class MergePermissionsTableIntoSubusers extends Migration
{
foreach (DB::select('SELECT id, permissions FROM subusers') as $datum) {
$values = [];
foreach(json_decode($datum->permissions, true) as $permission) {
foreach (json_decode($datum->permissions, true) as $permission) {
$values[] = $datum->id;
$values[] = $permission;
}
if (!empty($values)) {
if (! empty($values)) {
$string = 'VALUES ' . implode(', ', array_fill(0, count($values) / 2, '(?, ?)'));
DB::insert('INSERT INTO permissions(`subuser_id`, `permission`) ' . $string, $values);

4
database/migrations/2020_04_03_230614_create_backups_table.php
View file

@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateBackupsTable extends Migration
{

4
database/migrations/2020_04_10_141024_store_node_tokens_as_encrypted_value.php
View file

@ -3,9 +3,9 @@
use Ramsey\Uuid\Uuid;
use Illuminate\Support\Facades\DB;
use Illuminate\Container\Container;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Contracts\Encryption\Encrypter;
class StoreNodeTokensAsEncryptedValue extends Migration