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

small nudge enhancements

Browse Source 
darcs-hash:20081118155643-099f7-df2d332253d9acc007966b28f5afc2edcd7cc9ac.gz
This commit is contained in:
millette 2008-11-18 10:56:43 -05:00
parent d1ecedfffe
commit 9f1b4b3ed6
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
actions/nudge.php
View File

@ -27,13 +27,35 @@ class NudgeAction extends Action {
parent::handle($args); parent::handle($args);
if (!common_logged_in()) { if (!common_logged_in()) {
common_user_error(_('Not logged in.')); $this->client_error(_('Not logged in.'));
return; return;
} }
$user = common_current_user(); $user = common_current_user();
$other_nickname = common_canonical_nickname($args['nickname']); // $other_nickname = common_canonical_nickname($args['nickname']);
$other = User::staticGet('nickname', $other_nickname); // $other_nickname = $this->arg('nickname');
// $other = User::staticGet('nickname', $other_nickname);
$other = User::staticGet('nickname', $this->arg('nickname'));
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)));
return;
}
# CSRF protection
$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;
}
if (!$other->email || !$other->emailnotifynudge) {
$this->client_error(_('This user doesn\'t allow nudges or hasn\'t confirmed or set his email yet.'));
return;
}
$this->notify($user, $other); $this->notify($user, $other);
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {

7
lib/util.php
View File

@ -1866,11 +1866,7 @@ function common_favor_form($notice) {
function common_nudge_form($profile) { function common_nudge_form($profile) {
common_element_start('form', array('id' => 'nudge', 'method' => 'post', common_element_start('form', array('id' => 'nudge', 'method' => 'post',
'action' => common_local_url('nudge', array('nickname' => $profile->nickname)))); 'action' => common_local_url('nudge', array('nickname' => $profile->nickname))));
common_hidden('token', common_session_token()); //Is this necessary? common_hidden('token', common_session_token());
// common_element('input', array('id' => 'nudge_nickname',
// 'name' => 'nudge_nickname',
// 'type' => 'hidden',
// 'value' => $profile->nickname));
common_element('input', array('type' => 'submit', common_element('input', array('type' => 'submit',
'class' => 'submit', 'class' => 'submit',
'value' => _('Send a nudge'))); 'value' => _('Send a nudge')));
@ -1881,7 +1877,6 @@ function common_nudge_response() {
common_element('p', array('id' => 'nudge_response'), _('Nudge sent!')); common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
} }
function common_cache_key($extra) { function common_cache_key($extra) {
return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra; return 'laconica:' . common_keyize(common_config('site', 'name')) . ':' . $extra;
} }