Poll settings adapted to FormAction

plugins/Poll/actions/pollsettings.php

@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('GNUSOCIAL')) { exit(1); }
-    exit(1);
-}
 
 class PollSettingsAction extends SettingsAction
 {
@@ -56,143 +54,36 @@ class PollSettingsAction extends SettingsAction
         return _m('Set your poll preferences');
     }
 
-    /**
+    protected function getForm()
-     * Show the form for Poll
-     *
-     * @return void
-     */
-    function showContent()
     {
-        $user = common_current_user();
+        $prefs = User_poll_prefs::getKV('user_id', $this->scoped->getID());
-
-        $prefs = User_poll_prefs::getKV('user_id', $user->id);
-
         $form = new PollPrefsForm($this, $prefs);
-
+        return $form;
-        $form->show();
     }
 
-    /**
+    protected function doPost()
-     * Handler method
-     *
-     * @param array $argarray is ignored since it's now passed in in prepare()
-     *
-     * @return void
-     */
-
-    function handlePost()
     {
-        $user = common_current_user();
+        $upp = User_poll_prefs::getKV('user_id', $this->scoped->getID());
-
-        $upp = User_poll_prefs::getKV('user_id', $user->id);
         $orig = null;
 
-        if (!empty($upp)) {
+        if ($upp instanceof User_poll_prefs) {
             $orig = clone($upp);
         } else {
             $upp = new User_poll_prefs();
-            $upp->user_id = $user->id;
+            $upp->user_id = $this->scoped->getID();
             $upp->created = common_sql_now();
         }
 
         $upp->hide_responses = $this->boolean('hide_responses');
         $upp->modified       = common_sql_now();
 
-        if (!empty($orig)) {
+        if ($orig instanceof User_poll_prefs) {
             $upp->update($orig);
         } else {
             $upp->insert();
         }
 
         // TRANS: Confirmation shown when user profile settings are saved.
-        $this->showForm(_('Settings saved.'), true);
+        return _('Settings saved.');
-
-        return;
-    }
-}
-
-class PollPrefsForm extends Form
-{
-    var $prefs;
-
-    function __construct($out, $prefs)
-    {
-        parent::__construct($out);
-        $this->prefs = $prefs;
-    }
-
-    /**
-     * Visible or invisible data elements
-     *
-     * Display the form fields that make up the data of the form.
-     * Sub-classes should overload this to show their data.
-     *
-     * @return void
-     */
-
-    function formData()
-    {
-        $this->elementStart('fieldset');
-        $this->elementStart('ul', 'form_data');
-        $this->elementStart('li');
-        $this->checkbox('hide_responses',
-                        _('Do not deliver poll responses to my home timeline'),
-                        (!empty($this->prefs) && $this->prefs->hide_responses));
-        $this->elementEnd('li');
-        $this->elementEnd('ul');
-        $this->elementEnd('fieldset');
-    }
-
-    /**
-     * Buttons for form actions
-     *
-     * Submit and cancel buttons (or whatever)
-     * Sub-classes should overload this to show their own buttons.
-     *
-     * @return void
-     */
-
-    function formActions()
-    {
-        $this->submit('submit', _('Save'));
-    }
-
-    /**
-     * ID of the form
-     *
-     * Should be unique on the page. Sub-classes should overload this
-     * to show their own IDs.
-     *
-     * @return int ID of the form
-     */
-
-    function id()
-    {
-        return 'form_poll_prefs';
-    }
-
-    /**
-     * Action of the form.
-     *
-     * URL to post to. Should be overloaded by subclasses to give
-     * somewhere to post to.
-     *
-     * @return string URL to post to
-     */
-
-    function action()
-    {
-        return common_local_url('pollsettings');
-    }
-
-    /**
-     * Class of the form. May include space-separated list of multiple classes.
-     *
-     * @return string the form's class
-     */
-
-    function formClass()
-    {
-        return 'form_settings';
     }
 }

plugins/Poll/forms/pollprefs.php

@@ -0,0 +1,87 @@
+<?php
+
+if (!defined('GNUSOCIAL')) { exit(1); }
+
+class PollPrefsForm extends Form
+{
+    function __construct(Action $out, User_poll_prefs $prefs=null)
+    {
+        parent::__construct($out);
+        $this->prefs = $prefs;
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->elementStart('fieldset');
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
+        $this->checkbox('hide_responses',
+                        _('Do not deliver poll responses to my home timeline'),
+                        ($this->prefs instanceof User_poll_prefs && $this->prefs->hide_responses));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->submit('submit', _('Save'));
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'form_poll_prefs';
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+        return common_local_url('pollsettings');
+    }
+
+    /**
+     * Class of the form. May include space-separated list of multiple classes.
+     *
+     * @return string the form's class
+     */
+
+    function formClass()
+    {
+        return 'form_settings';
+    }
+}