X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fdeletegroup.php;h=c64bc1d8e90fd47fb91cfd4d0cd4743b358f8ad0;hb=3d66d960a1c1c3abe7682c776a8ab9b69f87c298;hp=4e9b9851f12a6abc34ebb2180aca2502b8542fb9;hpb=fa6c6077d6e49d03b10da4339e3c97e0734897de;p=quix0rs-gnu-social.git

diff --git a/actions/deletegroup.php b/actions/deletegroup.php
index 4e9b9851f1..c64bc1d8e9 100644
--- a/actions/deletegroup.php
+++ b/actions/deletegroup.php
@@ -62,13 +62,12 @@ class DeletegroupAction extends RedirectingAction
         if (!common_logged_in()) {
             // TRANS: Client error when trying to delete group while not logged in.
             $this->clientError(_('You must be logged in to delete a group.'));
-            return false;
         }
 
         $nickname_arg = $this->trimmed('nickname');
         $id = intval($this->arg('id'));
         if ($id) {
-            $this->group = User_group::staticGet('id', $id);
+            $this->group = User_group::getKV('id', $id);
         } else if ($nickname_arg) {
             $nickname = common_canonical_nickname($nickname_arg);
 
@@ -77,35 +76,30 @@ class DeletegroupAction extends RedirectingAction
             if ($nickname_arg != $nickname) {
                 $args = array('nickname' => $nickname);
                 common_redirect(common_local_url('leavegroup', $args), 301);
-                return false;
             }
 
-            $local = Local_group::staticGet('nickname', $nickname);
+            $local = Local_group::getKV('nickname', $nickname);
 
             if (!$local) {
                 // TRANS: Client error when trying to delete a non-local group.
                 $this->clientError(_('No such group.'), 404);
-                return false;
             }
 
-            $this->group = User_group::staticGet('id', $local->group_id);
+            $this->group = User_group::getKV('id', $local->group_id);
         } else {
             // TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
             $this->clientError(_('No nickname or ID.'), 404);
-            return false;
         }
 
         if (!$this->group) {
             // TRANS: Client error when trying to delete a non-existing group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         $cur = common_current_user();
         if (!$cur->hasRight(Right::DELETEGROUP)) {
             // TRANS: Client error when trying to delete a group without having the rights to delete it.
             $this->clientError(_('You are not allowed to delete this group.'), 403);
-            return false;
         }
 
         return true;
@@ -162,12 +156,11 @@ class DeletegroupAction extends RedirectingAction
             $this->elementStart('body');
             // @fixme add a sensible AJAX response form!
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
             // @fixme if we could direct to the page on which this group
             // would have shown... that would be awesome
-            common_redirect(common_local_url('groups'),
-                            303);
+            common_redirect(common_local_url('groups'), 303);
         }
     }
 
@@ -178,6 +171,8 @@ class DeletegroupAction extends RedirectingAction
 
     function showContent() {
         $this->areYouSureForm();
+        $block = new GroupProfileBlock($this, $this->group);
+        $block->show();
     }
 
     /**
@@ -221,14 +216,14 @@ class DeletegroupAction extends RedirectingAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a group.
-                      _('Do not delete this group'));
+                      _('Do not delete this group.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete group form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when deleting a group.
-                      _('Delete this group'));
+                      _('Delete this group.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }