eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

pass profile id for subscriptions rather than user name

Browse Source 
darcs-hash:20081208031312-5ed1f-b570b86b28e8eda763c51be1ae091034f76bd984.gz
This commit is contained in:
Evan Prodromou 2008-12-07 22:13:12 -05:00
parent 81a81baf83
commit fd6df5402e
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
actions/subscribe.php
View File

@ -20,7 +20,7 @@
if (!defined('LACONICA')) { exit(1); } if (!defined('LACONICA')) { exit(1); }
class SubscribeAction extends Action { class SubscribeAction extends Action {
function handle($args) { function handle($args) {
parent::handle($args); parent::handle($args);
@ -39,16 +39,23 @@ class SubscribeAction 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('subscribeto'); $other_id = $this->arg('subscribeto');
$other = User::staticGet('id', $other_id);
if (!$other) {
$this->client_error(_('Not a local user.'));
return;
}
$result = subs_subscribe_to($user, $other);
$result=subs_subscribe_user($user, $other_nickname);
if($result != true) { if($result != true) {
common_user_error($result); common_user_error($result);
return; return;

6
lib/util.php
View File

@ -2050,15 +2050,15 @@ function common_nudge_response() {
} }
function common_subscribe_form($profile) { function common_subscribe_form($profile) {
common_element_start('form', array('id' => 'subscribe-' . $profile->nickname, common_element_start('form', array('id' => 'subscribe-' . $profile->id,
'method' => 'post', 'method' => 'post',
'class' => 'subscribe', 'class' => 'subscribe',
'action' => common_local_url('subscribe'))); 'action' => common_local_url('subscribe')));
common_hidden('token', common_session_token()); common_hidden('token', common_session_token());
common_element('input', array('id' => 'subscribeto-' . $profile->nickname, common_element('input', array('id' => 'subscribeto-' . $profile->id,
'name' => 'subscribeto', 'name' => 'subscribeto',
'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' => _('Subscribe'))); 'value' => _('Subscribe')));