Started fiddling with CancelRSVP but more must be done

Remember to make event_uri be the selector for CancelRSVPForm and
preferrably even merge it into RSVPForm!

plugins/Event/EventPlugin.php

@@ -436,9 +436,9 @@ class EventPlugin extends ActivityVerbHandlerPlugin
             $rsvp = $event->getRSVP($scoped);
 
             if (empty($rsvp)) {
-                $form = new RSVPForm($event, $out);
+                $form = new RSVPForm($out, array('event'=>$event));
             } else {
-                $form = new CancelRSVPForm($rsvp, $out);
+                $form = new CancelRSVPForm($out, array('rsvp'=>$rsvp));
             }
 
             $form->show();

plugins/Event/actions/cancelrsvp.php

@@ -40,96 +40,42 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class CancelrsvpAction extends Action
+class CancelrsvpAction extends FormAction
 {
-    protected $user  = null;
+    protected $form = 'CancelRSVP';
-    protected $rsvp  = null;
-    protected $event = null;
 
-    /**
-     * Returns the title of the action
-     *
-     * @return string Action title
-     */
     function title()
     {
         // TRANS: Title for RSVP ("please respond") action.
         return _m('TITLE','Cancel RSVP');
     }
 
-    /**
+    // FIXME: Merge this action with RSVPAction and add a 'cancel' thing there...
-     * For initializing members of the class.
+    protected function doPreparation()
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-    function prepare($argarray)
     {
-        parent::prepare($argarray);
-        if ($this->boolean('ajax')) {
-            GNUsocial::setApi(true); // short error results!
-        }
-
         $rsvpId = $this->trimmed('rsvp');
-
         if (empty($rsvpId)) {
             // TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
             throw new ClientException(_m('No such RSVP.'));
         }
 
         $this->rsvp = RSVP::getKV('id', $rsvpId);
-
         if (empty($this->rsvp)) {
             // TRANS: Client exception thrown when referring to a non-existing RSVP ("please respond") item.
             throw new ClientException(_m('No such RSVP.'));
         }
 
-        $this->event = Happening::getKV('uri', $this->rsvp->event_uri);
+        $this->formOpts['rsvp'] = $this->rsvp;
+    }
 
+    protected function doPost()
+    {
+        $this->event = Happening::getKV('uri', $this->rsvp->event_uri);
         if (empty($this->event)) {
             // TRANS: Client exception thrown when referring to a non-existing event.
             throw new ClientException(_m('No such event.'));
         }
 
-        $this->user = common_current_user();
-
-        if (empty($this->user)) {
-            // TRANS: Client exception thrown when trying tp RSVP ("please respond") while not logged in.
-            throw new ClientException(_m('You must be logged in to RSVP for an event.'));
-        }
-
-        return true;
-    }
-
-    /**
-     * Handler method
-     *
-     * @param array $argarray is ignored since it's now passed in in prepare()
-     *
-     * @return void
-     */
-    function handle($argarray=null)
-    {
-        parent::handle($argarray);
-
-        if ($this->isPost()) {
-            $this->cancelRSVP();
-        } else {
-            $this->showPage();
-        }
-
-        return;
-    }
-
-    /**
-     * Add a new event
-     *
-     * @return void
-     */
-    function cancelRSVP()
-    {
-        try {
         $notice = $this->rsvp->getNotice();
         // NB: this will delete the rsvp, too
         if (!empty($notice)) {
@@ -139,60 +85,5 @@ class CancelrsvpAction extends Action
             common_log(LOG_DEBUG, "Deleting RSVP alone...");
             $this->rsvp->delete();
         }
-        } catch (ClientException $ce) {
-            $this->error = $ce->getMessage();
-            $this->showPage();
-            return;
-        }
-
-        if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8');
-            $this->elementStart('head');
-            // TRANS: Page title after sending a notice.
-            $this->element('title', null, _m('Event saved'));
-            $this->elementEnd('head');
-            $this->elementStart('body');
-            $form = new RSVPForm($this->event, $this);
-            $form->show();
-            $this->elementEnd('body');
-            $this->endHTML();
-        }
-    }
-
-    /**
-     * Show the event form
-     *
-     * @return void
-     */
-    function showContent()
-    {
-        if (!empty($this->error)) {
-            $this->element('p', 'error', $this->error);
-        }
-
-        $form = new CancelRSVPForm($this->rsvp, $this);
-
-        $form->show();
-
-        return;
-    }
-
-    /**
-     * Return true if read only.
-     *
-     * MAY override
-     *
-     * @param array $args other arguments
-     *
-     * @return boolean is read only action?
-     */
-    function isReadOnly($args)
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
-            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
-            return true;
-        } else {
-            return false;
-        }
     }
 }

plugins/Event/forms/cancelrsvp.php

@@ -49,7 +49,7 @@ class CancelRSVPForm extends Form
         parent::__construct($out);
         if (!isset($formOpts['rsvp'])) {
             throw new ServerException('You must set the "rsvp" form option for RSVPForm.');
-        } elseif (!$formOpts['rsvp'] instanceof Happening) {
+        } elseif (!$formOpts['rsvp'] instanceof RSVP) {
             throw new ServerException('The "rsvp" form option for RSVPForm must be an RSVP object.');
         }
         $this->rsvp = $formOpts['rsvp'];