X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Feditgroup.php;h=7b499d00ffdff60819788b6b0adbcae0f8ba0fe1;hb=0a20abf1d8a9a068df9310d6903cc303f39b25ed;hp=8405dbe2927180a541cf715431c80c98dcaf6b55;hpb=36d619480a8f5fa06db5b54fe7686de83d8225be;p=quix0rs-gnu-social.git diff --git a/actions/editgroup.php b/actions/editgroup.php index 8405dbe292..7b499d00ff 100644 --- a/actions/editgroup.php +++ b/actions/editgroup.php @@ -59,14 +59,13 @@ class EditgroupAction extends GroupAction * Prepare to run */ - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); if (!common_logged_in()) { // TRANS: Client error displayed trying to edit a group while not logged in. $this->clientError(_('You must be logged in to create a group.')); - return false; } $nickname_arg = $this->trimmed('nickname'); @@ -77,30 +76,27 @@ class EditgroupAction extends GroupAction if ($nickname_arg != $nickname) { $args = array('nickname' => $nickname); common_redirect(common_local_url('editgroup', $args), 301); - return false; } if (!$nickname) { // TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit. $this->clientError(_('No nickname.'), 404); - return false; } $groupid = $this->trimmed('groupid'); if ($groupid) { - $this->group = User_group::staticGet('id', $groupid); + $this->group = User_group::getKV('id', $groupid); } else { - $local = Local_group::staticGet('nickname', $nickname); + $local = Local_group::getKV('nickname', $nickname); if ($local) { - $this->group = User_group::staticGet('id', $local->group_id); + $this->group = User_group::getKV('id', $local->group_id); } } if (!$this->group) { // TRANS: Client error displayed trying to edit a non-existing group. $this->clientError(_('No such group.'), 404); - return false; } $cur = common_current_user(); @@ -108,7 +104,6 @@ class EditgroupAction extends GroupAction if (!$cur->isAdmin($this->group)) { // TRANS: Client error displayed trying to edit a group while not being a group admin. $this->clientError(_('You must be an admin to edit the group.'), 403); - return false; } return true; @@ -119,13 +114,11 @@ class EditgroupAction extends GroupAction * * On GET, show the form. On POST, try to save the group. * - * @param array $args unused - * * @return void */ - function handle($args) + protected function handle() { - parent::handle($args); + parent::handle(); if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->trySave(); } else { @@ -139,12 +132,6 @@ class EditgroupAction extends GroupAction $this->showPage(); } - function showObjectNav() - { - $nav = new GroupNav($this, $this->group); - $nav->show(); - } - function showContent() { $form = new GroupEditForm($this, $this->group); @@ -165,7 +152,7 @@ class EditgroupAction extends GroupAction function showScripts() { parent::showScripts(); - $this->autofocus('nickname'); + $this->autofocus('newnickname'); } function trySave() @@ -174,12 +161,25 @@ class EditgroupAction extends GroupAction if (!$cur->isAdmin($this->group)) { // TRANS: Client error displayed trying to edit a group while not being a group admin. $this->clientError(_('You must be an admin to edit the group.'), 403); - return; } if (Event::handle('StartGroupSaveForm', array($this))) { - $nickname = Nickname::normalize($this->trimmed('nickname')); + $nickname = $this->trimmed('newnickname'); + try { + $nickname = Nickname::normalize($nickname, true); + } catch (NicknameTakenException $e) { + // Abort only if the nickname is occupied by _another_ group + if ($e->profile->id != $this->group->profile_id) { + $this->showForm($e->getMessage()); + return; + } + $nickname = Nickname::normalize($nickname); // without in-use check this time + } catch (NicknameException $e) { + $this->showForm($e->getMessage()); + return; + } + $fullname = $this->trimmed('fullname'); $homepage = $this->trimmed('homepage'); $description = $this->trimmed('description'); @@ -195,18 +195,8 @@ class EditgroupAction extends GroupAction $join_policy = User_group::JOIN_POLICY_OPEN; } - if ($this->nicknameExists($nickname)) { - // TRANS: Group edit form validation error. - $this->showForm(_('Nickname already in use. Try another one.')); - return; - } else if (!User_group::allowedNickname($nickname)) { - // TRANS: Group edit form validation error. - $this->showForm(_('Not a valid nickname.')); - return; - } else if (!is_null($homepage) && (strlen($homepage) > 0) && - !Validate::uri($homepage, - array('allowed_schemes' => - array('http', 'https')))) { + if (!is_null($homepage) && (strlen($homepage) > 0) && + !common_valid_http_url($homepage)) { // TRANS: Group edit form validation error. $this->showForm(_('Homepage is not a valid URL.')); return; @@ -229,7 +219,8 @@ class EditgroupAction extends GroupAction } if (!empty($aliasstring)) { - $aliases = array_map('common_canonical_nickname', array_unique(preg_split('/[\s,]+/', $aliasstring))); + $aliases = array_map(array('Nickname', 'normalize'), + array_unique(preg_split('/[\s,]+/', $aliasstring))); } else { $aliases = array(); } @@ -244,26 +235,6 @@ class EditgroupAction extends GroupAction return; } - foreach ($aliases as $alias) { - if (!Nickname::isValid($alias)) { - // TRANS: Group edit form validation error. - $this->showForm(sprintf(_('Invalid alias: "%s"'), $alias)); - return; - } - if ($this->nicknameExists($alias)) { - // TRANS: Group edit form validation error. - $this->showForm(sprintf(_('Alias "%s" already in use. Try another one.'), - $alias)); - return; - } - // XXX assumes alphanum nicknames - if (strcmp($alias, $nickname) == 0) { - // TRANS: Group edit form validation error. - $this->showForm(_('Alias can\'t be the same as nickname.')); - return; - } - } - $this->group->query('BEGIN'); $orig = clone($this->group); @@ -279,7 +250,7 @@ class EditgroupAction extends GroupAction $result = $this->group->update($orig); - if (!$result) { + if ($result === false) { common_log_db_error($this->group, 'UPDATE', __FILE__); // TRANS: Server error displayed when editing a group fails. $this->serverError(_('Could not update group.')); @@ -292,43 +263,16 @@ class EditgroupAction extends GroupAction $this->serverError(_('Could not create aliases.')); } - if ($nickname != $orig->nickname) { - common_log(LOG_INFO, "Saving local group info."); - $local = Local_group::staticGet('group_id', $this->group->id); - $local->setNickname($nickname); - } - $this->group->query('COMMIT'); Event::handle('EndGroupSaveForm', array($this)); } if ($this->group->nickname != $orig->nickname) { - common_redirect(common_local_url('editgroup', - array('nickname' => $nickname)), - 303); + common_redirect(common_local_url('editgroup', array('nickname' => $nickname)), 303); } else { // TRANS: Group edit form success message. $this->showForm(_('Options saved.')); } } - - function nicknameExists($nickname) - { - $group = Local_group::staticGet('nickname', $nickname); - - if (!empty($group) && - $group->group_id != $this->group->id) { - return true; - } - - $alias = Group_alias::staticGet('alias', $nickname); - - if (!empty($alias) && - $alias->group_id != $this->group->id) { - return true; - } - - return false; - } }