unsubscribe from a remote profile

darcs-hash:20081203180945-5ed1f-747b3c0e00ced81c02953e1095a9b866a7876c43.gz
This commit is contained in:
Evan Prodromou 2008-12-03 13:09:45 -05:00
parent 63500f10f8
commit acb00a903e
2 changed files with 22 additions and 10 deletions

View File

@ -18,7 +18,7 @@
*/ */
class UnsubscribeAction extends Action { class UnsubscribeAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
if (!common_logged_in()) { if (!common_logged_in()) {
@ -36,28 +36,40 @@ class UnsubscribeAction extends Action {
# CSRF protection # CSRF protection
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$this->client_error(_('There was a problem with your session token. Try again, please.')); $this->client_error(_('There was a problem with your session token. Try again, please.'));
return; return;
} }
$other_nickname = $this->arg('unsubscribeto'); $other_id = $this->arg('unsubscribeto');
$result=subs_unsubscribe_user($user,$other_nickname);
if($result!=true) { if (!$other_id) {
$this->client_error(_('No profile id in request.'));
return;
}
$other = Profile::staticGet('id', $other_id);
if (!$other_id) {
$this->client_error(_('No profile with that id.'));
return;
}
$result = subs_unsubscribe_to($user, $other);
if ($result != true) {
common_user_error($result); common_user_error($result);
return; return;
} }
$profile = Profile::staticGet('nickname', $other_nickname);
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
common_start_html('text/xml'); common_start_html('text/xml');
common_element_start('head'); common_element_start('head');
common_element('title', null, _('Unsubscribed')); common_element('title', null, _('Unsubscribed'));
common_element_end('head'); common_element_end('head');
common_element_start('body'); common_element_start('body');
common_subscribe_form($profile); common_subscribe_form($other);
common_element_end('body'); common_element_end('body');
common_element_end('html'); common_element_end('html');
} else { } else {

View File

@ -2059,10 +2059,10 @@ function common_unsubscribe_form($profile) {
'class' => 'unsubscribe', 'class' => 'unsubscribe',
'action' => common_local_url('unsubscribe'))); 'action' => common_local_url('unsubscribe')));
common_hidden('token', common_session_token()); common_hidden('token', common_session_token());
common_element('input', array('id' => 'unsubscribeto-' . $profile->nickname, common_element('input', array('id' => 'unsubscribeto-' . $profile->id,
'name' => 'unsubscribeto', 'name' => 'unsubscribeto',
'type' => 'hidden', 'type' => 'hidden',
'value' => $profile->nickname)); 'value' => $profile->id));
common_element('input', array('type' => 'submit', common_element('input', array('type' => 'submit',
'class' => 'submit', 'class' => 'submit',
'value' => _('Unsubscribe'))); 'value' => _('Unsubscribe')));