GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "UnsubscribeAction: Add LACONICA gate, fix PHPCS errors, fix error handling typo." 

This reverts commit e1270b26f5.
This commit is contained in:
Evan Prodromou 2009-08-10 16:42:04 -04:00
parent 6aee059033
commit 36eaf42bbb
1 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
actions/unsubscribe.php
View File

@ -1,16 +1,5 @@
<?php <?php
/** /*
* Unsubscribe handler
*
* PHP version 5
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* Laconica - a distributed open-source microblogging tool * Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, 2009, Control Yourself, Inc. * Copyright (C) 2008, 2009, Control Yourself, Inc.
* *
@ -28,20 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
if (!defined('LACONICA')) {
exit(1);
}
/**
* Unsubscribe handler
*
* @category Action
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*/
class UnsubscribeAction extends Action class UnsubscribeAction extends Action
{ {
@ -56,18 +31,16 @@ class UnsubscribeAction extends Action
$user = common_current_user(); $user = common_current_user();
if ($_SERVER['REQUEST_METHOD'] != 'POST') { if ($_SERVER['REQUEST_METHOD'] != 'POST') {
common_redirect(common_local_url('subscriptions', common_redirect(common_local_url('subscriptions', array('nickname' => $user->nickname)));
array('nickname' => $user->nickname)));
return; return;
} }
/* Use a session token for 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->clientError(_('There was a problem with your session token. ' . $this->clientError(_('There was a problem with your session token. Try again, please.'));
'Try again, please.'));
return; return;
} }
@ -80,7 +53,7 @@ class UnsubscribeAction extends Action
$other = Profile::staticGet('id', $other_id); $other = Profile::staticGet('id', $other_id);
if (!$other) { if (!$other_id) {
$this->clientError(_('No profile with that id.')); $this->clientError(_('No profile with that id.'));
return; return;
} }
@ -103,8 +76,8 @@ class UnsubscribeAction extends Action
$this->elementEnd('body'); $this->elementEnd('body');
$this->elementEnd('html'); $this->elementEnd('html');
} else { } else {
common_redirect(common_local_url('subscriptions', common_redirect(common_local_url('subscriptions', array('nickname' =>
array('nickname' => $user->nickname)), $user->nickname)),
303); 303);
} }
} }