MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-17 13:53:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/react-admin

Browse Source
This commit is contained in:
Matthew Penner
2021-07-17 11:12:02 -06:00
parent 7ad32293f3 0b6236aa2a
commit bc4e28578d
24 changed files with 356 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Allocation.php
View File

@@ -56,7 +56,7 @@ class Allocation extends Model
public static $validationRules = [
'node_id' => 'required|exists:nodes,id',
'ip' => 'required|ip',
'port' => 'required|numeric|between:1024,65553',
'port' => 'required|numeric|between:1024,65535',
'ip_alias' => 'nullable|string',
'server_id' => 'nullable|exists:servers,id',
'notes' => 'nullable|string|max:256',

2
app/Repositories/Eloquent/DatabaseRepository.php
View File

@@ -107,7 +107,7 @@ class DatabaseRepository extends EloquentRepository implements DatabaseRepositor
public function assignUserToDatabase(string $database, string $username, string $remote): bool
{
return $this->run(sprintf(
'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, INDEX, LOCK TABLES, CREATE ROUTINE, ALTER ROUTINE, EXECUTE ON `%s`.* TO `%s`@`%s`',
'GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, REFERENCES, INDEX, LOCK TABLES, CREATE ROUTINE, ALTER ROUTINE, EXECUTE ON `%s`.* TO `%s`@`%s`',
$database,
$username,
$remote

2
app/Services/Eggs/EggConfigurationService.php
View File

@@ -50,7 +50,7 @@ class EggConfigurationService
return [
'done' => is_string($done) ? [$done] : $done,
'user_interaction' => Arr::get($startup, 'userInteraction') ?? Arr::get($startup, 'user_interaction') ?? [],
'user_interaction' => [],
'strip_ansi' => Arr::get($startup, 'strip_ansi') ?? false,
];
}