yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' into maxlength

Browse source
This commit is contained in:
Marcin Mikołajczak 2018-08-26 18:52:12 +02:00 • committed by GitHub
commit a1588a82c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
185 changed files with 11208 additions and 1534 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/Auth/RegisterController.php
View file

@ -51,11 +51,22 @@ class RegisterController extends Controller
protected function validator(array $data)
{
$this->validateUsername($data['username']);
$usernameRules = [
'required',
'alpha_dash',
'min:2',
'max:15',
'unique:users',
function($attribute, $value, $fail) {
if(!ctype_alpha($value[0])) {
return $fail($attribute . ' is invalid. Username must be alpha-numeric and start with a letter.');
}
}
];
$rules = [
'name' => 'required|string|max' . config('pixelfed.max_name_length'),
'username' => 'required|alpha_dash|min:2|max:15|unique:users',
'username' => $usernameRules,
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
];