wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make apigroupcreate.php pass phpcs

Browse Source
This commit is contained in:
Zach Copley 2009-10-12 14:46:22 -07:00
parent 7fcaffdf86
commit da9d02b038
1 changed files with 73 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
actions/apigroupcreate.php
View File

@ -94,7 +94,7 @@ class ApiGroupCreateAction extends ApiAuthAction
{ {
parent::handle($args); parent::handle($args);
if (!common_config('inboxes','enabled')) { if (!common_config('inboxes', 'enabled')) {
$this->serverError( $this->serverError(
_('Inboxes must be enabled for groups to work'), _('Inboxes must be enabled for groups to work'),
400, 400,
@ -202,14 +202,15 @@ class ApiGroupCreateAction extends ApiAuthAction
function validateParams() function validateParams()
{ {
if (!Validate::string( $valid = Validate::string(
$this->nickname, array( $this->nickname, array(
'min_length' => 1, 'min_length' => 1,
'max_length' => 64, 'max_length' => 64,
'format' => NICKNAME_FMT) 'format' => NICKNAME_FMT
) )
) );
{
if (!$valid) {
$this->clientError( $this->clientError(
_( _(
'Nickname must have only lowercase letters ' . 'Nickname must have only lowercase letters ' .
@ -234,24 +235,24 @@ class ApiGroupCreateAction extends ApiAuthAction
); );
return false; return false;
} elseif (!is_null($this->homepage) } elseif (
!is_null($this->homepage)
&& strlen($this->homepage) > 0 && strlen($this->homepage) > 0
&& !Validate::uri( && !Validate::uri(
$this->homepage, array( $this->homepage, array(
'allowed_schemes' => 'allowed_schemes' =>
array('http', 'https') array('http', 'https')
) )
)) )) {
{
$this->clientError( $this->clientError(
_('Homepage is not a valid URL.'), _('Homepage is not a valid URL.'),
403, 403,
$this->format $this->format
); );
return false; return false;
} elseif (!is_null($this->fullname) } elseif (
&& mb_strlen($this->fullname) > 255) !is_null($this->fullname)
{ && mb_strlen($this->fullname) > 255) {
$this->clientError( $this->clientError(
_('Full name is too long (max 255 chars).'), _('Full name is too long (max 255 chars).'),
403, 403,
@ -259,16 +260,18 @@ class ApiGroupCreateAction extends ApiAuthAction
); );
return false; return false;
} elseif (User_group::descriptionTooLong($this->description)) { } elseif (User_group::descriptionTooLong($this->description)) {
$this->clientError(sprintf( $this->clientError(
sprintf(
_('Description is too long (max %d chars).'), _('Description is too long (max %d chars).'),
User_group::maxDescription()), User_group::maxDescription()
),
403, 403,
$this->format $this->format
); );
return false; return false;
} elseif (!is_null($this->location) } elseif (
&& mb_strlen($this->location) > 255) !is_null($this->location)
{ && mb_strlen($this->location) > 255) {
$this->clientError( $this->clientError(
_('Location is too long (max 255 chars).'), _('Location is too long (max 255 chars).'),
403, 403,
@ -280,9 +283,7 @@ class ApiGroupCreateAction extends ApiAuthAction
if (!empty($this->aliasstring)) { if (!empty($this->aliasstring)) {
$this->aliases = array_map( $this->aliases = array_map(
'common_canonical_nickname', 'common_canonical_nickname',
array_unique(preg_split('/[\s,]+/', array_unique(preg_split('/[\s,]+/', $this->aliasstring))
$this->aliasstring)
)
); );
} else { } else {
$this->aliases = array(); $this->aliases = array();
@ -290,8 +291,10 @@ class ApiGroupCreateAction extends ApiAuthAction
if (count($this->aliases) > common_config('group', 'maxaliases')) { if (count($this->aliases) > common_config('group', 'maxaliases')) {
$this->clientError( $this->clientError(
sprintf(_('Too many aliases! Maximum %d.'), sprintf(
common_config('group', 'maxaliases')), _('Too many aliases! Maximum %d.'),
common_config('group', 'maxaliases')
),
403, 403,
$this->format $this->format
); );
@ -299,13 +302,16 @@ class ApiGroupCreateAction extends ApiAuthAction
} }
foreach ($this->aliases as $alias) { foreach ($this->aliases as $alias) {
if (!Validate::string($alias, array(
$valid = Validate::string(
$alias, array(
'min_length' => 1, 'min_length' => 1,
'max_length' => 64, 'max_length' => 64,
'format' => NICKNAME_FMT 'format' => NICKNAME_FMT
) )
)) );
{
if (!$valid) {
$this->clientError( $this->clientError(
sprintf(_('Invalid alias: "%s"'), $alias), sprintf(_('Invalid alias: "%s"'), $alias),
403, 403,
@ -315,8 +321,10 @@ class ApiGroupCreateAction extends ApiAuthAction
} }
if ($this->groupNicknameExists($alias)) { if ($this->groupNicknameExists($alias)) {
$this->clientError( $this->clientError(
sprintf(_('Alias "%s" already in use. Try another one.'), sprintf(
$alias), _('Alias "%s" already in use. Try another one.'),
$alias
),
403, 403,
$this->format $this->format
); );
@ -340,6 +348,14 @@ class ApiGroupCreateAction extends ApiAuthAction
return true; return true;
} }
/**
* Check to see whether a nickname is already in use by a group
*
* @param String $nickname The nickname in question
*
* @return boolean true or false
*/
function groupNicknameExists($nickname) function groupNicknameExists($nickname)
{ {
$group = User_group::staticGet('nickname', $nickname); $group = User_group::staticGet('nickname', $nickname);