GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fullname and location are now text, not varchar, and can be >191|255

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-01-28 19:11:43 +01:00
parent c0851d59f5
commit a6898b033d
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/apiaccountregister.php
View File

@ -131,9 +131,6 @@ class ApiAccountRegisterAction extends ApiAction
!common_valid_http_url($homepage)) { !common_valid_http_url($homepage)) {
// TRANS: Form validation error displayed when trying to register with an invalid homepage URL. // TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
$this->clientError(_('Homepage is not a valid URL.'), 400); $this->clientError(_('Homepage is not a valid URL.'), 400);
} else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
// TRANS: Form validation error displayed when trying to register with a too long full name.
$this->clientError(_('Full name is too long (maximum 255 characters).'), 400);
} else if (Profile::bioTooLong($bio)) { } else if (Profile::bioTooLong($bio)) {
// TRANS: Form validation error on registration page when providing too long a bio text. // TRANS: Form validation error on registration page when providing too long a bio text.
// TRANS: %d is the maximum number of characters for bio; used for plural. // TRANS: %d is the maximum number of characters for bio; used for plural.
@ -141,9 +138,6 @@ class ApiAccountRegisterAction extends ApiAction
'Bio is too long (maximum %d characters).', 'Bio is too long (maximum %d characters).',
Profile::maxBio()), Profile::maxBio()),
Profile::maxBio()), 400); Profile::maxBio()), 400);
} else if (!is_null($location) && mb_strlen($location) > 255) {
// TRANS: Form validation error displayed when trying to register with a too long location.
$this->clientError(_('Location is too long (maximum 255 characters).'), 400);
} else if (strlen($password) < 6) { } else if (strlen($password) < 6) {
// TRANS: Form validation error displayed when trying to register with too short a password. // TRANS: Form validation error displayed when trying to register with too short a password.
$this->clientError(_('Password must be 6 or more characters.'), 400); $this->clientError(_('Password must be 6 or more characters.'), 400);
@ -197,4 +191,4 @@ class ApiAccountRegisterAction extends ApiAction
return is_object($user); return is_object($user);
} }
} }

6
actions/register.php
View File

@ -208,9 +208,6 @@ class RegisterAction extends Action
!common_valid_http_url($homepage)) { !common_valid_http_url($homepage)) {
// TRANS: Form validation error displayed when trying to register with an invalid homepage URL. // TRANS: Form validation error displayed when trying to register with an invalid homepage URL.
$this->showForm(_('Homepage is not a valid URL.')); $this->showForm(_('Homepage is not a valid URL.'));
} else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
// TRANS: Form validation error displayed when trying to register with a too long full name.
$this->showForm(_('Full name is too long (maximum 255 characters).'));
} else if (Profile::bioTooLong($bio)) { } else if (Profile::bioTooLong($bio)) {
// TRANS: Form validation error on registration page when providing too long a bio text. // TRANS: Form validation error on registration page when providing too long a bio text.
// TRANS: %d is the maximum number of characters for bio; used for plural. // TRANS: %d is the maximum number of characters for bio; used for plural.
@ -218,9 +215,6 @@ class RegisterAction extends Action
'Bio is too long (maximum %d characters).', 'Bio is too long (maximum %d characters).',
Profile::maxBio()), Profile::maxBio()),
Profile::maxBio())); Profile::maxBio()));
} else if (!is_null($location) && mb_strlen($location) > 255) {
// TRANS: Form validation error displayed when trying to register with a too long location.
$this->showForm(_('Location is too long (maximum 255 characters).'));
} else if (strlen($password) < 6) { } else if (strlen($password) < 6) {
// TRANS: Form validation error displayed when trying to register with too short a password. // TRANS: Form validation error displayed when trying to register with too short a password.
$this->showForm(_('Password must be 6 or more characters.')); $this->showForm(_('Password must be 6 or more characters.'));