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

Finish api/statusnet/groups/update

This commit is contained in:
Zach Copley 2010-05-07 00:52:54 -07:00
parent b407665b98
commit 06a63b0404
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actions/apigroupprofileupdate.php
View File

@ -33,8 +33,6 @@ if (!defined('STATUSNET')) {
require_once INSTALLDIR . '/lib/apiauth.php'; require_once INSTALLDIR . '/lib/apiauth.php';
class ApiValidationException extends Exception { }
/** /**
* API analog to the group edit page * API analog to the group edit page
* *
@ -62,6 +60,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
parent::prepare($args); parent::prepare($args);
$this->nickname = common_canonical_nickname($this->trimmed('nickname')); $this->nickname = common_canonical_nickname($this->trimmed('nickname'));
$this->fullname = $this->trimmed('fullname'); $this->fullname = $this->trimmed('fullname');
$this->homepage = $this->trimmed('homepage'); $this->homepage = $this->trimmed('homepage');
$this->description = $this->trimmed('description'); $this->description = $this->trimmed('description');
@ -172,12 +171,12 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
$this->serverError(_('Could not update group.')); $this->serverError(_('Could not update group.'));
} }
$aliases = null; $aliases = array();
try { try {
if (!empty($this->aliasstring)) { if (!empty($this->aliasstring)) {
$aliases = $this->parseAliases(); $aliases = $this->validateAliases();
} }
} catch (ApiValidationException $ave) { } catch (ApiValidationException $ave) {
@ -195,7 +194,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
$this->serverError(_('Could not create aliases.')); $this->serverError(_('Could not create aliases.'));
} }
if (!empty($this->nickname) && $this->nickname != $orig->nickname) { if (!empty($this->nickname) && ($this->nickname != $orig->nickname)) {
common_log(LOG_INFO, "Saving local group info."); common_log(LOG_INFO, "Saving local group info.");
$local = Local_group::staticGet('group_id', $this->group->id); $local = Local_group::staticGet('group_id', $this->group->id);
$local->setNickname($this->nickname); $local->setNickname($this->nickname);
@ -260,6 +259,8 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
_('Not a valid nickname.') _('Not a valid nickname.')
); );
} }
return true;
} }
function validateHomepage() function validateHomepage()
@ -319,10 +320,6 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
) )
); );
if (empty($aliases)) {
$aliases = array();
}
if (count($aliases) > common_config('group', 'maxaliases')) { if (count($aliases) > common_config('group', 'maxaliases')) {
throw new ApiValidationException( throw new ApiValidationException(
sprintf( sprintf(
@ -357,7 +354,7 @@ class ApiGroupProfileUpdateAction extends ApiAuthAction
} }
// XXX assumes alphanum nicknames // XXX assumes alphanum nicknames
if (strcmp($alias, $nickname) == 0) { if (strcmp($alias, $this->nickname) == 0) {
throw new ApiValidationException( throw new ApiValidationException(
_('Alias can\'t be the same as nickname.') _('Alias can\'t be the same as nickname.')
); );

2
lib/apiaction.php
View File

@ -97,6 +97,8 @@ if (!defined('STATUSNET')) {
exit(1); exit(1);
} }
class ApiValidationException extends Exception { }
/** /**
* Contains most of the Twitter-compatible API output functions. * Contains most of the Twitter-compatible API output functions.
* *