summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/block.php6
-rw-r--r--actions/unblock.php72
-rw-r--r--lib/profileformaction.php2
3 files changed, 17 insertions, 63 deletions
diff --git a/actions/block.php b/actions/block.php
index b125d2d8b..2443b3010 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -64,7 +64,7 @@ class BlockAction extends Action
$this->clientError(_('There was a problem with your session token. Try again, please.'));
return;
}
- $id = $this->trimmed('blockto');
+ $id = $this->trimmed('profileid');
if (!$id) {
$this->clientError(_('No profile specified.'));
return false;
@@ -97,7 +97,7 @@ class BlockAction extends Action
303);
} elseif ($this->arg('yes')) {
$this->blockProfile();
- } elseif ($this->arg('blockto')) {
+ } else {
$this->showPage();
}
}
@@ -138,7 +138,7 @@ class BlockAction extends Action
'unable to subscribe to you in the future, and '.
'you will not be notified of any @-replies from them.'));
$this->element('input', array('id' => 'blockto-' . $id,
- 'name' => 'blockto',
+ 'name' => 'profileid',
'type' => 'hidden',
'value' => $id));
foreach ($this->args as $k => $v) {
diff --git a/actions/unblock.php b/actions/unblock.php
index dc28d5d54..c60458cd3 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -42,57 +42,25 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://status.net/
*/
-class UnblockAction extends Action
-{
- var $profile = null;
- /**
- * Take arguments for running
- *
- * @param array $args $_REQUEST args
- *
- * @return boolean success flag
- */
+class UnblockAction extends ProfileFormAction
+{
function prepare($args)
{
- parent::prepare($args);
- if (!common_logged_in()) {
- $this->clientError(_('Not logged in.'));
- return false;
- }
- $token = $this->trimmed('token');
- if (!$token || $token != common_session_token()) {
- $this->clientError(_('There was a problem with your session token. Try again, please.'));
- return;
- }
- $id = $this->trimmed('unblockto');
- if (!$id) {
- $this->clientError(_('No profile specified.'));
+ if (!parent::prepare($args)) {
return false;
}
- $this->profile = Profile::staticGet('id', $id);
- if (!$this->profile) {
- $this->clientError(_('No profile with that ID.'));
+
+ $cur = common_current_user();
+
+ assert(!empty($cur)); // checked by parent
+
+ if (!$cur->hasBlocked($this->profile)) {
+ $this->clientError(_("You haven't blocked that user."));
return false;
}
- return true;
- }
- /**
- * Handle request
- *
- * Shows a page with list of favorite notices
- *
- * @param array $args $_REQUEST args; handled in prepare()
- *
- * @return void
- */
- function handle($args)
- {
- parent::handle($args);
- if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $this->unblockProfile();
- }
+ return true;
}
/**
@@ -100,7 +68,8 @@ class UnblockAction extends Action
*
* @return void
*/
- function unblockProfile()
+
+ function handlePost()
{
$cur = common_current_user();
$result = $cur->unblock($this->profile);
@@ -108,20 +77,5 @@ class UnblockAction extends Action
$this->serverError(_('Error removing the block.'));
return;
}
- foreach ($this->args as $k => $v) {
- if ($k == 'returnto-action') {
- $action = $v;
- } else if (substr($k, 0, 9) == 'returnto-') {
- $args[substr($k, 9)] = $v;
- }
- }
- if ($action) {
- common_redirect(common_local_url($action, $args), 303);
- } else {
- common_redirect(common_local_url('subscribers',
- array('nickname' => $cur->nickname)),
- 303);
- }
}
}
-
diff --git a/lib/profileformaction.php b/lib/profileformaction.php
index 92e8611b9..8cb5f6a93 100644
--- a/lib/profileformaction.php
+++ b/lib/profileformaction.php
@@ -134,6 +134,6 @@ class ProfileFormAction extends Action
function handlePost()
{
- return;
+ $this->serverError(_("unimplemented method"));
}
}