Merge remote-tracking branch 'evan/blogplugin' into newblogplugin

[quix0rs-gnu-social.git] / plugins / Event / showrsvp.php

diff --git a/plugins/Event/showrsvp.php b/plugins/Event/showrsvp.php
index 1f96b394df246bd059cfdcb67500e4941f86976f..da80448af83d6b035e11d57e5f2473bb3e393cd2 100644 (file)
--- a/plugins/Event/showrsvp.php
+++ b/plugins/Event/showrsvp.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2010, StatusNet, Inc.
  *
  * Show a single RSVP
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -49,17 +49,8 @@ class ShowrsvpAction extends ShownoticeAction
     protected $rsvp = null;
     protected $event = null;
 
-    /**
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
+    function getNotice()
     {
-        OwnerDesignAction::prepare($argarray);
-
         $this->id = $this->trimmed('id');
 
         $this->rsvp = RSVP::staticGet('id', $this->id);
@@ -74,48 +65,19 @@ class ShowrsvpAction extends ShownoticeAction
 
         if (empty($this->event)) {
             // TRANS: Client exception thrown when referring to a non-existing event.
-            throw new ClientException(_m('No such Event.'), 404);
+            throw new ClientException(_m('No such event.'), 404);
         }
 
-        $this->notice = $this->rsvp->getNotice();
+        $notice = $this->rsvp->getNotice();
 
-        if (empty($this->notice)) {
+        if (empty($notice)) {
             // Did we used to have it, and it got deleted?
             // TRANS: Client exception thrown when referring to a non-existing RSVP.
             // TRANS: RSVP stands for "Please reply".
             throw new ClientException(_m('No such RSVP.'), 404);
         }
 
-        $cur = common_current_user();
-
-        if (!empty($cur)) {
-            $curProfile = $cur->getProfile();
-        } else {
-            $curProfile = null;
-        }
-
-        if (!$this->notice->inScope($curProfile)) {
-            // TRANS: Client exception thrown when referring to an event the user has no access to.
-            throw new ClientException(_m('Not available.'), 403);
-        }
-
-        $this->user = User::staticGet('id', $this->rsvp->profile_id);
-
-        if (empty($this->user)) {
-            // TRANS: Client exception thrown when referring to a non-existing user.
-            throw new ClientException(_m('No such user.'), 404);
-        }
-
-        $this->profile = $this->user->getProfile();
-
-        if (empty($this->profile)) {
-            // TRANS: Server exception thrown when referring to a user without a profile.
-            throw new ServerException(_m('User without a profile.'));
-        }
-
-        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-        return true;
+        return $notice;
     }
 
     /**
@@ -129,7 +91,7 @@ class ShowrsvpAction extends ShownoticeAction
     {
         // TRANS: Title for event.
        // TRANS: %1$s is a user nickname, %2$s is an event title.
-        return sprintf(_('%1$s\'s RSVP for "%2$s"'),
+        return sprintf(_m('%1$s\'s RSVP for "%2$s"'),
                        $this->user->nickname,
                        $this->event->title);
     }