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

Minor function definitions so they match Action parent

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-10-20 17:21:56 +02:00
parent 9811783f19
commit 2729c622ff
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/OStatus/actions/ostatusinit.php
View File

@ -35,14 +35,13 @@ class OStatusInitAction extends Action
var $profile; var $profile;
var $err; var $err;
function prepare($args) protected function prepare($args)
{ {
parent::prepare($args); parent::prepare($args);
if (common_logged_in()) { if (common_logged_in()) {
// TRANS: Client error. // TRANS: Client error.
$this->clientError(_m('You can use the local subscription!')); $this->clientError(_m('You can use the local subscription!'));
return false;
} }
// Local user or group the remote wants to subscribe to // Local user or group the remote wants to subscribe to
@ -57,9 +56,9 @@ class OStatusInitAction extends Action
return true; return true;
} }
function handle($args) protected function handle()
{ {
parent::handle($args); parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
/* Use a session token for CSRF protection. */ /* Use a session token for CSRF protection. */

10
plugins/OStatus/actions/pushcallback.php
View File

@ -28,15 +28,15 @@ if (!defined('STATUSNET')) {
class PushCallbackAction extends Action class PushCallbackAction extends Action
{ {
function handle() protected function handle()
{ {
StatusNet::setApi(true); // Minimize error messages to aid in debugging StatusNet::setApi(true); // Minimize error messages to aid in debugging
parent::handle(); parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->isPost()) {
$this->handlePost(); return $this->handlePost();
} else {
$this->handleGet();
} }
return $this->handleGet();
} }
/** /**

4
plugins/OStatus/actions/pushhub.php
View File

@ -47,13 +47,13 @@ class PushHubAction extends Action
return parent::arg($arg, $def); return parent::arg($arg, $def);
} }
function prepare($args) protected function prepare($args)
{ {
StatusNet::setApi(true); // reduce exception reports to aid in debugging StatusNet::setApi(true); // reduce exception reports to aid in debugging
return parent::prepare($args); return parent::prepare($args);
} }
function handle() protected function handle()
{ {
$mode = $this->trimmed('hub.mode'); $mode = $this->trimmed('hub.mode');
switch ($mode) { switch ($mode) {