Forgotten migrations of ->profile and ->user to ->getTarget()

[quix0rs-gnu-social.git] / actions / cancelgroup.php

diff --git a/actions/cancelgroup.php b/actions/cancelgroup.php
index 68d7f39139db1e83fcc13a6573008243fc1de32f..93f630e0609123a59757bc96fc880279b1bdcffe 100644 (file)
--- a/actions/cancelgroup.php
+++ b/actions/cancelgroup.php
@@ -57,56 +57,51 @@ class CancelgroupAction extends Action
         if (!common_logged_in()) {
             // TRANS: Client error displayed when trying to leave a group while not logged in.
             $this->clientError(_('You must be logged in to leave 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);
 
             // Permanent redirect on non-canonical nickname
-
             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 displayed when trying to leave 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 displayed when trying to leave a group without providing a group name or group ID.
             $this->clientError(_('No nickname or ID.'), 404);
-            return false;
         }
 
         if (!$this->group) {
             // TRANS: Client error displayed when trying to leave a non-existing group.
             $this->clientError(_('No such group.'), 404);
-            return false;
         }
 
         $cur = common_current_user();
         if (empty($cur)) {
+            // TRANS: Client error displayed when trying to leave a group while not logged in.
             $this->clientError(_('Must be logged in.'), 403);
-            return false;
         }
         if ($this->arg('profile_id')) {
             if ($cur->isAdmin($this->group)) {
-                $this->profile = Profile::staticGet('id', $this->arg('profile_id'));
+                $this->profile = Profile::getKV('id', $this->arg('profile_id'));
             } else {
+                // TRANS: Client error displayed when trying to approve or cancel a group join request without
+                // TRANS: being a group administrator.
                 $this->clientError(_('Only group admin can approve or cancel join requests.'), 403);
-                return false;
             }
         } else {
             $this->profile = $cur->getProfile();
@@ -116,6 +111,8 @@ class CancelgroupAction extends Action
                                                          'group_id' => $this->group->id));
 
         if (empty($this->request)) {
+            // TRANS: Client error displayed when trying to approve a non-existing group join request.
+            // TRANS: %s is a user nickname.
             $this->clientError(sprintf(_('%s is not in the moderation queue for this group.'), $this->profile->nickname), 403);
         }
         return true;
@@ -135,9 +132,9 @@ class CancelgroupAction extends Action
         parent::handle($args);
 
         try {
-            $this->profile->cancelJoinGroup($this->group);
+            $this->request->abort();
         } catch (Exception $e) {
-            common_log(LOG_ERROR, "Exception canceling group sub: " . $e->getMessage());
+            common_log(LOG_ERR, "Exception canceling group sub: " . $e->getMessage());
             // TRANS: Server error displayed when cancelling a queued group join request fails.
             // TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
             $this->serverError(sprintf(_('Could not cancel request for user %1$s to join group %2$s.'),
@@ -149,6 +146,7 @@ class CancelgroupAction extends Action
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
             // TRANS: Title for leave group page after leaving.
+            // TRANS: %s$s is the leaving user's name, %2$s is the group name.
             $this->element('title', null, sprintf(_m('TITLE','%1$s left group %2$s'),
                                                   $this->profile->nickname,
                                                   $this->group->nickname));
@@ -157,11 +155,9 @@ class CancelgroupAction extends Action
             $jf = new JoinForm($this, $this->group);
             $jf->show();
             $this->elementEnd('body');
-            $this->elementEnd('html');
+            $this->endHTML();
         } else {
-            common_redirect(common_local_url('groupmembers', array('nickname' =>
-                                                                   $this->group->nickname)),
-                            303);
+            common_redirect(common_local_url('groupmembers', array('nickname' => $this->group->nickname)), 303);
         }
     }
 }