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

Prepare the RepeatAction for modernisation (more OOP)

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-10-21 22:26:37 +02:00
parent 38da5ec7f7
commit a6c52c5ca7
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
actions/repeat.php
View File

@ -45,18 +45,12 @@ class RepeatAction extends Action
var $user = null; var $user = null;
var $notice = null; var $notice = null;
function prepare($args) protected $needLogin = true;
protected function prepare($args)
{ {
parent::prepare($args); parent::prepare($args);
$this->user = common_current_user();
if (empty($this->user)) {
// TRANS: Client error displayed when trying to repeat a notice while not logged in.
$this->clientError(_('Only logged-in users can repeat notices.'));
return false;
}
$id = $this->trimmed('notice'); $id = $this->trimmed('notice');
if (empty($id)) { if (empty($id)) {
@ -67,13 +61,13 @@ class RepeatAction extends Action
$this->notice = Notice::getKV('id', $id); $this->notice = Notice::getKV('id', $id);
if (empty($this->notice)) { if (!($this->notice instanceof Notice)) {
// TRANS: Client error displayed when trying to repeat a non-existing notice. // TRANS: Client error displayed when trying to repeat a non-existing notice.
$this->clientError(_('No notice specified.')); $this->clientError(_('No notice specified.'));
return false; return false;
} }
$token = $this->trimmed('token-'.$id); $token = $this->trimmed('token-'.$id);
if (empty($token) || $token != common_session_token()) { if (empty($token) || $token != common_session_token()) {
// TRANS: Client error displayed when the session token does not match or is not given. // TRANS: Client error displayed when the session token does not match or is not given.
@ -91,9 +85,11 @@ class RepeatAction extends Action
* *
* @return void * @return void
*/ */
function handle($args) protected function handle()
{ {
$repeat = $this->notice->repeat($this->user->id, 'web'); parent::handle();
$repeat = $this->notice->repeat($this->scoped->id, 'web');
if ($this->boolean('ajax')) { if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8'); $this->startHTML('text/xml;charset=utf-8');