From 9b4df5056f2dba6b6fa7ac392c2114fd3c1400a0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 8 Dec 2008 00:55:11 -0500 Subject: add block form to subscribers list and profile page I added a small form for blocking users to profiles in the profile list, and also to the profile page. I also added an action to handle the results of blocking someone. This required some changes to the profile list class (so I could add the block form), so I made them. And the gallery class lets its subclasses return a subclass of ProfileList for their profile list. darcs-hash:20081208055511-5ed1f-e2e09986bd3b9cbb6a00a0c6b94f49ea78b7bdab.gz --- actions/block.php | 146 ++++++++++++++++++++++++++++++++++++++++++++++ actions/showstream.php | 6 ++ actions/subscribers.php | 12 +++- actions/subscriptions.php | 11 ++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 actions/block.php (limited to 'actions') diff --git a/actions/block.php b/actions/block.php new file mode 100644 index 000000000..a9fcfb49c --- /dev/null +++ b/actions/block.php @@ -0,0 +1,146 @@ +. + */ + +if (!defined('LACONICA')) { exit(1); } + +class BlockAction 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('blockto'); + + 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; + } + } + + function handle($args=NULL) { + if ($_SERVER['REQUEST_METHOD'] == 'POST') { + if ($this->arg('block')) { + $this->are_you_sure_form(); + } else if ($this->arg('no')) { + $cur = common_current_user(); + common_redirect(common_local_url('subscribers', + array('nickname' => $cur->nickname))); + } else if ($this->arg('yes')) { + $this->block_profile(); + } + } + } + + function are_you_sure_form() { + + $id = $this->profile->id; + + common_element_start('p', NULL, + _('Are you sure you want to block this user? '. + 'Afterwards, they will be unsubscribed from you, '. + 'unable to subscribe to you in the future, and '. + 'you will not be notified of any @-replies from them.')); + + common_element_start('form', array('id' => 'block-' . $id, + 'method' => 'post', + 'class' => 'block', + 'action' => common_local_url('block'))); + + common_hidden('token', common_session_token()); + + common_element('input', array('id' => 'blockto-' . $id, + 'name' => 'blockto', + 'type' => 'hidden', + 'value' => $id)); + + common_submit('no', _('No')); + common_submit('yes', _('Yes')); + + common_element_end('form'); + } + + function block_profile() { + + $cur = common_current_user(); + + if ($cur->hasBlocked($this->profile)) { + $this->client_error(_('You have already blocked this user.')); + return; + } + + # Add a new block record + + $block = new Profile_block(); + + # Begin a transaction + + $block->query('BEGIN'); + + $block->blocker = $cur->id; + $block->blocked = $this->profile->id; + + $result = $block->insert(); + + if (!$result) { + common_log_db_error($block, 'INSERT', __FILE__); + $this->server_error(_('Could not save new block record.')); + return; + } + + # Cancel their subscription, if it exists + + $sub = Subscription::pkeyGet(array('subscriber' => $this->profile->id, + 'subscribed' => $cur->id)); + + if ($sub) { + $result = $sub->delete(); + if (!$result) { + common_log_db_error($sub, 'DELETE', __FILE__); + $this->server_error(_('Could not delete subscription.')); + return; + } + } + + $block->query('COMMIT'); + + common_redirect(common_local_url('subscribers', + array('nickname' => $cur->nickname))); + } +} diff --git a/actions/showstream.php b/actions/showstream.php index bd1b8a7de..e12a227e3 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -202,6 +202,12 @@ class ShowstreamAction extends StreamAction { $user = User::staticGet('id', $profile->id); common_profile_new_message_nudge($cur, $user, $profile); + if ($cur) { + common_element_start('li', array('id' => 'profile_block')); + common_block_form($profile); + common_element_end('li'); + } + common_element_end('ul'); common_element_end('div'); diff --git a/actions/subscribers.php b/actions/subscribers.php index 2e37e0315..253d8440d 100644 --- a/actions/subscribers.php +++ b/actions/subscribers.php @@ -47,4 +47,14 @@ class SubscribersAction extends GalleryAction { function get_other(&$subs) { return $subs->subscriber; } -} \ No newline at end of file + + function profile_list_class() { + return 'SubscribersList'; + } +} + +class SubscribersList extends ProfileList { + function show_owner_controls($profile) { + common_block_form($profile); + } +} diff --git a/actions/subscriptions.php b/actions/subscriptions.php index aebfa22e8..3b16590d6 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -47,4 +47,15 @@ class SubscriptionsAction extends GalleryAction { function get_other(&$subs) { return $subs->subscribed; } + + function profile_list_class() { + return 'SubscriptionsList'; + } +} + +class SubscriptionsList extends ProfileList { + + function show_owner_controls() { + return; + } } -- cgit v1.2.3-54-g00ecf