From e3b53565bb5744116811cd88dbe67ae8df7547fd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 15 Nov 2009 15:57:59 +0100
Subject: unblockform uses profileactionform

---
 lib/unblockform.php | 98 ++++++++---------------------------------------------
 1 file changed, 14 insertions(+), 84 deletions(-)

(limited to 'lib/unblockform.php')

diff --git a/lib/unblockform.php b/lib/unblockform.php
index f1343757c..4fe28b21a 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -28,12 +28,10 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/form.php';
-
 /**
  * Form for unblocking a user
  *
@@ -47,106 +45,38 @@ require_once INSTALLDIR.'/lib/form.php';
  * @see      BlockForm
  */
 
-class UnblockForm extends Form
+class UnblockForm extends ProfileActionForm
 {
     /**
-     * Profile of user to unblock
-     */
-
-    var $profile = null;
-
-    /**
-     * Return-to args
-     */
-
-    var $args = null;
-
-    /**
-     * Constructor
-     *
-     * @param HTMLOutputter $out     output channel
-     * @param Profile       $profile profile of user to unblock
-     * @param array         $args    return-to args
-     */
-
-    function __construct($out=null, $profile=null, $args=null)
-    {
-        parent::__construct($out);
-
-        $this->profile = $profile;
-        $this->args    = $args;
-    }
-
-    /**
-     * ID of the form
-     *
-     * @return int ID of the form
-     */
-
-    function id()
-    {
-        return 'unblock-' . $this->profile->id;
-    }
-
-    /**
-     * class of the form
+     * Action this form provides
      *
-     * @return string class of the form
+     * @return string Name of the action, lowercased.
      */
 
-    function formClass()
+    function target()
     {
-        return 'form_user_unblock';
+        return 'unblock';
     }
 
     /**
-     * Action of the form
-     *
-     * @return string URL of the action
-     */
-
-    function action()
-    {
-        return common_local_url('unblock');
-    }
-
-    /**
-     * Legend of the Form
-     *
-     * @return void
-     */
-    function formLegend()
-    {
-        $this->out->element('legend', null, _('Unblock this user'));
-    }
-
-
-    /**
-     * Data elements of the form
+     * Title of the form
      *
-     * @return void
+     * @return string Title of the form, internationalized
      */
 
-    function formData()
+    function title()
     {
-        $this->out->hidden('unblockto-' . $this->profile->id,
-                           $this->profile->id,
-                           'unblockto');
-        if ($this->args) {
-            foreach ($this->args as $k => $v) {
-                $this->out->hidden('returnto-' . $k, $v);
-            }
-        }
+        return _('Unblock');
     }
 
     /**
-     * Action elements
+     * Description of the form
      *
-     * @return void
+     * @return string description of the form, internationalized
      */
 
-    function formActions()
+    function description()
     {
-        $this->out->submit('submit', _('Unblock'), 'submit', null, _('Unblock this user'));
+        return _('Unlock this user');
     }
 }
-- 
cgit v1.2.3-54-g00ecf


From 645b7dec2b40fb9c34306e7b445a120c6c09382d Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Wed, 18 Nov 2009 12:29:47 -0800
Subject: Terminology consistency fix: 'Unlock' -> 'Unblock' in unblock form
 description.

---
 lib/unblockform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/unblockform.php')

diff --git a/lib/unblockform.php b/lib/unblockform.php
index 4fe28b21a..2a444f7cd 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -77,6 +77,6 @@ class UnblockForm extends ProfileActionForm
 
     function description()
     {
-        return _('Unlock this user');
+        return _('Unblock this user');
     }
 }
-- 
cgit v1.2.3-54-g00ecf