From d13454fb84061357681e600762b470c9fc257f04 Mon Sep 17 00:00:00 2001 From: Akio Nishimura Date: Thu, 21 Jan 2016 08:10:35 +0900 Subject: [PATCH] Now we can delete a group logo. --- actions/grouplogo.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 0d9c135785..e3906847d3 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -211,6 +211,10 @@ class GrouplogoAction extends GroupAction 'height' => AVATAR_PROFILE_SIZE, 'alt' => $this->group->nickname)); $this->elementEnd('div'); + if (!empty($this->group->homepage_logo)) { + // TRANS: Button on group logo upload page to delete current group logo. + $this->submit('delete', _('Delete')); + } $this->elementEnd('li'); } @@ -315,6 +319,8 @@ class GrouplogoAction extends GroupAction $this->uploadLogo(); } else if ($this->arg('crop')) { $this->cropLogo(); + } else if ($this->arg('delete')) { + $this->deleteLogo(); } else { // TRANS: Form validation error message when an unsupported argument is used. $this->showForm(_('Unexpected form submission.')); @@ -409,6 +415,29 @@ class GrouplogoAction extends GroupAction } } + /** + * Get rid of the current group logo. + * + * @return void + */ + function deleteLogo() + { + $orig = clone($this->group); + Avatar::deleteFromProfile($this->group->getProfile()); + @unlink(Avatar::path(basename($this->group->original_logo))); + @unlink(Avatar::path(basename($this->group->homepage_logo))); + @unlink(Avatar::path(basename($this->group->stream_logo))); + @unlink(Avatar::path(basename($this->group->mini_logo))); + $this->group->original_logo=User_group::defaultLogo(AVATAR_PROFILE_SIZE); + $this->group->homepage_logo=User_group::defaultLogo(AVATAR_PROFILE_SIZE); + $this->group->stream_logo=User_group::defaultLogo(AVATAR_STREAM_SIZE); + $this->group->mini_logo=User_group::defaultLogo(AVATAR_MINI_SIZE); + $this->group->update($orig); + + // TRANS: Success message for deleting the group logo. + $this->showForm(_('Logo deleted.')); + } + function showPageNotice() { if ($this->msg) { -- 2.39.5