Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/cancelgroup.php b/actions/cancelgroup.php
index 089b4d751e7f2ac7ea48d4403b2a0d1cf6f91881..3074e3ffa3141db4fb47f851a0dbc92f76fc6eea 100644 (file)
--- a/actions/cancelgroup.php
+++ b/actions/cancelgroup.php
@@ -68,7 +68,6 @@ class CancelgroupAction extends Action
             $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);
@@ -97,13 +96,31 @@ class CancelgroupAction extends Action
         }
 
         $cur = common_current_user();
-        $this->profile = $cur->getProfile();
+        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'));
+            } 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();
+        }
 
         $this->request = Group_join_queue::pkeyGet(array('profile_id' => $this->profile->id,
                                                          'group_id' => $this->group->id));
 
         if (empty($this->request)) {
-            $this->clientError(_('You are not in the moderation queue for this group.'), 403);
+            // 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;
     }
@@ -122,9 +139,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.'),
@@ -136,6 +153,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));