summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
Diffstat (limited to 'actions')
-rw-r--r--actions/showstream.php4
-rw-r--r--actions/unblock.php102
2 files changed, 104 insertions, 2 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 0fc397811..2919a154f 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -206,8 +206,8 @@ class ShowstreamAction extends StreamAction {
$blocked = $cur->hasBlocked($profile);
common_element_start('li', array('id' => ($blocked) ? 'profile_unblock' : 'profile_block'));
if ($blocked) {
-# common_unblock_form($profile, array('action' => 'showstream',
-# 'nickname' => $profile->nickname));
+ common_unblock_form($profile, array('action' => 'showstream',
+ 'nickname' => $profile->nickname));
} else {
common_block_form($profile, array('action' => 'showstream',
'nickname' => $profile->nickname));
diff --git a/actions/unblock.php b/actions/unblock.php
new file mode 100644
index 000000000..192beaab5
--- /dev/null
+++ b/actions/unblock.php
@@ -0,0 +1,102 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class UnblockAction extends Action {
+
+ var $profile = NULL;
+
+ function prepare($args) {
+
+ parent::prepare($args);
+
+ if (!common_logged_in()) {
+ $this->client_error(_('Not logged in.'));
+ return false;
+ }
+
+ $token = $this->trimmed('token');
+
+ if (!$token || $token != common_session_token()) {
+ $this->client_error(_('There was a problem with your session token. Try again, please.'));
+ return;
+ }
+
+ $id = $this->trimmed('unblockto');
+
+ if (!$id) {
+ $this->client_error(_('No profile specified.'));
+ return false;
+ }
+
+ $this->profile = Profile::staticGet('id', $id);
+
+ if (!$this->profile) {
+ $this->client_error(_('No profile with that ID.'));
+ return false;
+ }
+
+ return true;
+ }
+
+ function handle($args) {
+ parent::handle($args);
+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+ $this->unblock_profile();
+ }
+ }
+
+ function unblock_profile() {
+
+ $cur = common_current_user();
+
+ # Get the block record
+
+ $block = Profile_block::get($cur->id, $this->profile->id);
+
+ if (!$block) {
+ $this->client_error(_('That user is not blocked!'));
+ return;
+ }
+
+ $result = $block->delete();
+
+ if (!$result) {
+ common_log_db_error($block, 'DELETE', __FILE__);
+ $this->server_error(_('Could not delete block record.'));
+ 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));
+ } else {
+ common_redirect(common_local_url('subscriptions',
+ array('nickname' => $cur->nickname)));
+ }
+ }
+}