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

Fix exception when adjusting mail settings, closes #907

Browse source
This commit is contained in:
Dane Everitt 2018-02-03 12:28:39 -06:00
parent 48c933fa0f
commit d9355b93b4
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Requests/Admin/Settings/MailSettingsFormRequest.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Http\Requests\Admin\Settings;
use Illuminate\Validation\Rule;
use Pterodactyl\Http\Requests\Admin\AdminFormRequest;
class MailSettingsFormRequest extends AdminFormRequest
@ -16,11 +17,11 @@ class MailSettingsFormRequest extends AdminFormRequest
return [
'mail:host' => 'required|string',
'mail:port' => 'required|integer|between:1,65535',
'mail:encryption' => 'present|string|in:"",tls,ssl',
'mail:username' => 'string|max:255',
'mail:password' => 'string|max:255',
'mail:encryption' => ['present', Rule::in([null, 'tls', 'ssl'])],
'mail:username' => 'nullable|string|max:255',
'mail:password' => 'nullable|string|max:255',
'mail:from:address' => 'required|string|email',
'mail:from:name' => 'string|max:255',
'mail:from:name' => 'nullable|string|max:255',
];
}
@ -31,7 +32,7 @@ class MailSettingsFormRequest extends AdminFormRequest
* @param array $only
* @return array
*/
public function normalize($only = [])
public function normalize(array $only = null)
{
$keys = array_flip(array_keys($this->rules()));