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

Merge branch 'strict-warnings' into 'nightly' 

Fix some strict warnings (Action::prepare, Action::handle)

I know MR with changes to a bunch of files aren't great practice, but I figured since all the changes are one-liners it might not be a huge deal.

Related to #190 

See merge request !123
This commit is contained in:
mmn 2016-06-17 16:29:47 -04:00
parent d66b495ba8 9de79f0a36
commit 005b4c8dd1
119 changed files with 272 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/addpeopletag.php
View File

@ -65,7 +65,7 @@ class AddpeopletagAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -119,7 +119,7 @@ class AddpeopletagAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
// Throws exception on error
$ptag = Profile_tag::setTag($this->user->id, $this->tagged->id,

6
actions/apiaccountupdatedeliverydevice.php
View File

@ -54,7 +54,7 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -73,9 +73,9 @@ class ApiAccountUpdateDeliveryDeviceAction extends ApiAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!in_array($this->format, array('xml', 'json'))) {
$this->clientError(

6
actions/apiatomservice.php
View File

@ -51,7 +51,7 @@ class ApiAtomServiceAction extends ApiBareAuthAction
* @return boolean success flag
*
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->user = $this->getTargetUser($this->arg('id'));
@ -71,9 +71,9 @@ class ApiAtomServiceAction extends ApiBareAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
header('Content-Type: application/atomsvc+xml');

6
actions/apigrouplistall.php
View File

@ -58,7 +58,7 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -77,9 +77,9 @@ class ApiGroupListAllAction extends ApiPrivateAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$sitename = common_config('site', 'name');
// TRANS: Message is used as a title when listing the lastest 20 groups. %s is a site name.

6
actions/apilistsubscriber.php
View File

@ -33,7 +33,7 @@ class ApiListSubscriberAction extends ApiBareAuthAction
{
var $list = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -52,9 +52,9 @@ class ApiListSubscriberAction extends ApiBareAuthAction
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$arr = array('profile_tag_id' => $this->list->id,
'profile_id' => $this->target->id);

4
actions/apioauthaccesstoken.php
View File

@ -52,9 +52,9 @@ class ApiOAuthAccessTokenAction extends ApiOAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$datastore = new ApiGNUsocialOAuthDataStore();
$server = new OAuthServer($datastore);

6
actions/apioauthauthorize.php
View File

@ -60,7 +60,7 @@ class ApiOAuthAuthorizeAction extends ApiOAuthAction
return false;
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -88,9 +88,9 @@ class ApiOAuthAuthorizeAction extends ApiOAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {

6
actions/apioauthrequesttoken.php
View File

@ -49,7 +49,7 @@ class ApiOAuthRequestTokenAction extends ApiOAuthAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -69,9 +69,9 @@ class ApiOAuthRequestTokenAction extends ApiOAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$datastore = new ApiGNUsocialOAuthDataStore();
$server = new OAuthServer($datastore);

6
actions/apisearchatom.php
View File

@ -88,7 +88,7 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
*
* @return boolean success
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -128,9 +128,9 @@ class ApiSearchAtomAction extends ApiPrivateAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
common_debug("In apisearchatom handle()");
$this->showAtom();
}

6
actions/apisearchjson.php
View File

@ -57,7 +57,7 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
*
* @return boolean true if nothing goes wrong
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -95,9 +95,9 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showResults();
}

6
actions/apitrends.php
View File

@ -53,7 +53,7 @@ class ApiTrendsAction extends ApiPrivateAuthAction
*
* @return boolean false if user doesn't exist
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
return true;
@ -66,9 +66,9 @@ class ApiTrendsAction extends ApiPrivateAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showTrends();
}

6
actions/approvegroup.php
View File

@ -50,7 +50,7 @@ class ApprovegroupAction extends Action
/**
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -139,9 +139,9 @@ class ApprovegroupAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
try {
if ($this->approve) {

6
actions/approvesub.php
View File

@ -50,7 +50,7 @@ class ApprovesubAction extends Action
/**
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -97,9 +97,9 @@ class ApprovesubAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$cur = common_current_user();
try {

4
actions/block.php
View File

@ -53,7 +53,7 @@ class BlockAction extends ProfileFormAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;
@ -78,7 +78,7 @@ class BlockAction extends ProfileFormAction
*
* @return void
*/
function handle($args)
function handle()
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {

6
actions/cancelgroup.php
View File

@ -50,7 +50,7 @@ class CancelgroupAction extends Action
/**
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -127,9 +127,9 @@ class CancelgroupAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
try {
$this->request->abort();

4
actions/deleteapplication.php
View File

@ -51,7 +51,7 @@ class DeleteapplicationAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;
@ -89,7 +89,7 @@ class DeleteapplicationAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {

6
actions/deletegroup.php
View File

@ -55,7 +55,7 @@ class DeletegroupAction extends RedirectingAction
* @fixme merge common setup code with other group actions
* @fixme allow group admins to delete their own groups
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -114,9 +114,9 @@ class DeletegroupAction extends RedirectingAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {
$this->returnToPrevious();

2
actions/deleteuser.php
View File

@ -80,7 +80,7 @@ class DeleteuserAction extends ProfileFormAction
*
* @return void
*/
function handle($args)
function handle()
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {

6
actions/editapplication.php
View File

@ -57,7 +57,7 @@ class EditApplicationAction extends Action
/**
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -94,9 +94,9 @@ class EditApplicationAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost($args);

6
actions/editpeopletag.php
View File

@ -60,7 +60,7 @@ class EditpeopletagAction extends Action
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -135,9 +135,9 @@ class EditpeopletagAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->trySave();
} else {

6
actions/featured.php
View File

@ -54,7 +54,7 @@ class FeaturedAction extends Action
return true;
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@ -74,9 +74,9 @@ class FeaturedAction extends Action
}
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
actions/foafgroup.php
View File

@ -35,7 +35,7 @@ class FoafGroupAction extends Action
return true;
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -76,9 +76,9 @@ class FoafGroupAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
header('Content-Type: application/rdf+xml');

4
actions/geocode.php
View File

@ -47,7 +47,7 @@ class GeocodeAction extends Action
var $lon = null;
var $location = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$token = $this->trimmed('token');
@ -70,7 +70,7 @@ class GeocodeAction extends Action
* @return nothing
*
*/
function handle($args)
function handle()
{
header('Content-Type: application/json; charset=utf-8');
$location_object = array();

2
actions/grantrole.php
View File

@ -49,7 +49,7 @@ class GrantRoleAction extends ProfileFormAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;

6
actions/groupblock.php
View File

@ -52,7 +52,7 @@ class GroupblockAction extends RedirectingAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
if (!common_logged_in()) {
@ -110,9 +110,9 @@ class GroupblockAction extends RedirectingAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
if ($this->arg('no')) {
$this->returnToPrevious();

6
actions/groups.php
View File

@ -67,16 +67,16 @@ class GroupsAction extends Action
}
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
actions/groupunblock.php
View File

@ -52,7 +52,7 @@ class GroupunblockAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
if (!common_logged_in()) {
@ -103,9 +103,9 @@ class GroupunblockAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->unblockProfile();
}

4
actions/invite.php
View File

@ -38,9 +38,9 @@ class InviteAction extends Action
return false;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!common_config('invite', 'enabled')) {
// TRANS: Client error displayed when trying to sent invites while they have been disabled.
$this->clientError(_('Invites have been disabled.'));

6
actions/makeadmin.php
View File

@ -54,7 +54,7 @@ class MakeadminAction extends RedirectingAction
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
if (!common_logged_in()) {
@ -111,9 +111,9 @@ class MakeadminAction extends RedirectingAction
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->makeAdmin();
}

2
actions/noticesearch.php
View File

@ -50,7 +50,7 @@ class NoticesearchAction extends SearchAction
{
protected $q = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);

4
actions/nudge.php
View File

@ -55,9 +55,9 @@ class NudgeAction extends Action
*
* @return nothing
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!common_logged_in()) {
// TRANS: Error message displayed when trying to perform an action that requires a logged in user.

4
actions/opensearch.php
View File

@ -53,9 +53,9 @@ class OpensearchAction extends Action
*
* @return boolean false if user doesn't exist
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$type = $this->trimmed('type');
$short_name = '';
if ($type == 'people') {

6
actions/otp.php
View File

@ -53,7 +53,7 @@ class OtpAction extends Action
var $returnto;
var $lt;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -110,9 +110,9 @@ class OtpAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
// success!
if (!common_set_user($this->user)) {

6
actions/peopletag.php
View File

@ -62,7 +62,7 @@ class PeopletagAction extends Action
}
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@ -84,9 +84,9 @@ class PeopletagAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

4
actions/peopletagautocomplete.php
View File

@ -44,7 +44,7 @@ class PeopletagautocompleteAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -112,7 +112,7 @@ class PeopletagautocompleteAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
//common_log(LOG_DEBUG, 'Autocomplete data: ' . json_encode($this->tags));
if ($this->tags) {

6
actions/peopletagged.php
View File

@ -53,7 +53,7 @@ class PeopletaggedAction extends Action
return true;
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@ -117,9 +117,9 @@ class PeopletaggedAction extends Action
}
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
actions/peopletagsbyuser.php
View File

@ -68,7 +68,7 @@ class PeopletagsbyuserAction extends Action
}
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -135,9 +135,9 @@ class PeopletagsbyuserAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
# Post from the tag dropdown; redirect to a GET

6
actions/peopletagsforuser.php
View File

@ -54,7 +54,7 @@ class PeopletagsforuserAction extends Action
}
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -95,9 +95,9 @@ class PeopletagsforuserAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
actions/peopletagsubscribers.php
View File

@ -53,7 +53,7 @@ class PeopletagsubscribersAction extends Action
return true;
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@ -117,9 +117,9 @@ class PeopletagsubscribersAction extends Action
}
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
actions/peopletagsubscriptions.php
View File

@ -56,7 +56,7 @@ class PeopletagsubscriptionsAction extends Action
}
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -97,9 +97,9 @@ class PeopletagsubscriptionsAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

4
actions/pluginenable.php
View File

@ -64,7 +64,7 @@ class PluginEnableAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -121,7 +121,7 @@ class PluginEnableAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
$key = 'disable-' . $this->plugin;
Config::save('plugins', $key, $this->overrideValue());

4
actions/profilecompletion.php
View File

@ -68,7 +68,7 @@ class ProfilecompletionAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -120,7 +120,7 @@ class ProfilecompletionAction extends Action
* @return void
*/
function handle($args)
function handle()
{
$this->msg = null;

4
actions/profiletagbyid.php
View File

@ -45,7 +45,7 @@ class ProfiletagbyidAction extends Action
return true;
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -83,7 +83,7 @@ class ProfiletagbyidAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
common_redirect($this->peopletag->homeUrl(), 303);
}

4
actions/publictagcloud.php
View File

@ -92,9 +92,9 @@ class PublictagcloudAction extends Action
$this->elementEnd('div');
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

4
actions/recoverpassword.php
View File

@ -29,9 +29,9 @@ class RecoverpasswordAction extends Action
var $msg = null;
var $success = null;
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_logged_in()) {
// TRANS: Client error displayed trying to recover password while already logged in.
$this->clientError(_('You are already logged in!'));

2
actions/redirect.php
View File

@ -63,7 +63,7 @@ class RedirectAction extends Action
*
* @return nothing
*/
function handle($args)
function handle()
{
common_redirect(common_local_url($this->arg('nextAction'), $this->arg('args')));
}

4
actions/register.php
View File

@ -120,9 +120,9 @@ class RegisterAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_config('site', 'closed')) {
// TRANS: Client error displayed when trying to register to a closed site.

4
actions/removepeopletag.php
View File

@ -66,7 +66,7 @@ class RemovepeopletagAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -120,7 +120,7 @@ class RemovepeopletagAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
// Throws exception on error

2
actions/revokerole.php
View File

@ -49,7 +49,7 @@ class RevokeRoleAction extends ProfileFormAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;

4
actions/rsd.php
View File

@ -85,7 +85,7 @@ class RsdAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -126,7 +126,7 @@ class RsdAction extends Action
*
* @return nothing
*/
function handle($args)
function handle()
{
header('Content-Type: application/rsd+xml');

2
actions/sandbox.php
View File

@ -49,7 +49,7 @@ class SandboxAction extends ProfileFormAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;

6
actions/showapplication.php
View File

@ -65,7 +65,7 @@ class ShowApplicationAction extends Action
*
* @return success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -101,9 +101,9 @@ class ShowApplicationAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {

6
actions/subedit.php
View File

@ -24,7 +24,7 @@ class SubeditAction extends Action
{
var $profile = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -58,9 +58,9 @@ class SubeditAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$cur = common_current_user();

4
actions/subscribe.php
View File

@ -64,7 +64,7 @@ class SubscribeAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -118,7 +118,7 @@ class SubscribeAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
// Throws exception on error

6
actions/subscribepeopletag.php
View File

@ -50,7 +50,7 @@ class SubscribepeopletagAction extends Action
/**
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -106,9 +106,9 @@ class SubscribepeopletagAction extends Action
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$cur = common_current_user();

4
actions/sup.php
View File

@ -22,9 +22,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
// @todo FIXME: documentation needed.
class SupAction extends Action
{
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$seconds = $this->trimmed('seconds');

2
actions/unblock.php
View File

@ -44,7 +44,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/
class UnblockAction extends ProfileFormAction
{
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;

2
actions/unsandbox.php
View File

@ -49,7 +49,7 @@ class UnsandboxAction extends ProfileFormAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
if (!parent::prepare($args)) {
return false;

4
actions/unsubscribe.php
View File

@ -44,9 +44,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/
class UnsubscribeAction extends Action
{
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!common_logged_in()) {
// TRANS: Error message displayed when trying to perform an action that requires a logged in user.
$this->clientError(_('Not logged in.'));

6
actions/unsubscribepeopletag.php
View File

@ -51,7 +51,7 @@ class UnsubscribepeopletagAction extends Action
* Prepare to run
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -106,9 +106,9 @@ class UnsubscribepeopletagAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$cur = common_current_user();

4
lib/adminpanelaction.php
View File

@ -60,7 +60,7 @@ class AdminPanelAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -119,7 +119,7 @@ class AdminPanelAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->checkSessionToken();

6
lib/profileformaction.php
View File

@ -51,7 +51,7 @@ class ProfileFormAction extends RedirectingAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -96,9 +96,9 @@ class ProfileFormAction extends RedirectingAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
try {

4
lib/searchaction.php
View File

@ -56,9 +56,9 @@ class SearchAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

4
plugins/AccountManager/actions/accountmanagementcontroldocument.php
View File

@ -49,9 +49,9 @@ class AccountManagementControlDocumentAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
header('Content-Type: application/json; charset=utf-8');

4
plugins/AccountManager/actions/accountmanagementsessionstatus.php
View File

@ -49,9 +49,9 @@ class AccountManagementSessionStatusAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$cur = common_current_user();
if(empty($cur)) {

2
plugins/ActivitySpam/actions/spam.php
View File

@ -106,7 +106,7 @@ class SpamAction extends Action
function handle($argarray=null)
{
parent::handle($args);
parent::handle();
$this->showPage();
}

4
plugins/AnonymousFave/actions/anondisfavor.php
View File

@ -47,9 +47,9 @@ class AnonDisfavorAction extends RedirectingAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$profile = AnonymousFavePlugin::getAnonProfile();

4
plugins/AnonymousFave/actions/anonfavor.php
View File

@ -47,9 +47,9 @@ class AnonFavorAction extends RedirectingAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$profile = AnonymousFavePlugin::getAnonProfile();

6
plugins/Bookmark/actions/apitimelinebookmarks.php
View File

@ -57,7 +57,7 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -82,9 +82,9 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showTimeline();
}

2
plugins/Bookmark/actions/bookmarkforurl.php
View File

@ -59,7 +59,7 @@ class BookmarkforurlAction extends Action
*
* @return boolean true
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);

6
plugins/Bookmark/actions/bookmarks.php
View File

@ -60,7 +60,7 @@ class BookmarksAction extends Action
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -107,9 +107,9 @@ class BookmarksAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

4
plugins/CasAuthentication/actions/caslogin.php
View File

@ -21,9 +21,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
class CasloginAction extends Action
{
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_is_real_login()) {
// TRANS: Client error displayed when trying to log in while already logged on.
$this->clientError(_m('Already logged in.'));

4
plugins/ClientSideShorten/actions/shorten.php
View File

@ -45,7 +45,7 @@ class ShortenAction extends Action
{
private $text;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->groups=array();
@ -60,7 +60,7 @@ class ShortenAction extends Action
function handle($args=null)
{
parent::handle($args);
parent::handle();
header('Content-Type: text/plain');
$shortened_text = common_shorten_links($this->text);
print $shortened_text;

4
plugins/DirectMessage/actions/showmessage.php
View File

@ -62,7 +62,7 @@ class ShowmessageAction extends Action
*
* @return success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -89,7 +89,7 @@ class ShowmessageAction extends Action
return true;
}
function handle($args)
function handle()
{
$this->showPage();
}

6
plugins/DirectMessage/lib/mailboxaction.php
View File

@ -46,7 +46,7 @@ class MailboxAction extends Action
{
var $page = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -70,9 +70,9 @@ class MailboxAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!$this->user) {
// TRANS: Client error displayed when trying to access a mailbox without providing a user.

2
plugins/DomainStatusNetwork/actions/globalapi.php
View File

@ -57,7 +57,7 @@ class GlobalApiAction extends Action
* @return boolean continuation flag
*/
function prepare($args)
function prepare(array $args = array())
{
GNUsocial::setApi(true); // reduce exception reports to aid in debugging

6
plugins/Event/actions/timelist.php
View File

@ -42,7 +42,7 @@ class TimelistAction extends Action {
*
* @return boolean true
*/
function prepare($args) {
function prepare(array $args = array()) {
parent::prepare($args);
$this->start = $this->arg('start');
$this->duration = $this->boolean('duration', false);
@ -56,9 +56,9 @@ class TimelistAction extends Action {
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!common_logged_in()) {
// TRANS: Error message displayed when trying to perform an action that requires a logged in user.

6
plugins/ExtendedProfile/actions/userautocomplete.php
View File

@ -43,7 +43,7 @@ class UserautocompleteAction extends Action
*
* @return boolean true if nothing goes wrong
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->query = $this->trimmed('term');
@ -57,9 +57,9 @@ class UserautocompleteAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showResults();
}

6
plugins/FacebookBridge/actions/facebookdeauthorize.php
View File

@ -48,7 +48,7 @@ class FacebookdeauthorizeAction extends Action
*
* @return boolean true
*/
function prepare($args)
function prepare(array $args = array())
{
$this->facebook = Facebookclient::getFacebook();
@ -60,9 +60,9 @@ class FacebookdeauthorizeAction extends Action
*
* @param array $args is ignored since it's now passed in in prepare()
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$data = $this->facebook->getSignedRequest();

6
plugins/FacebookBridge/actions/facebookfinishlogin.php
View File

@ -37,7 +37,7 @@ class FacebookfinishloginAction extends Action
private $fbuser = null; // Facebook user object (JSON)
private $accessToken = null; // Access token provided by Facebook JS API
function prepare($args) {
function prepare(array $args = array()) {
parent::prepare($args);
// Check cookie for a valid access_token
@ -79,9 +79,9 @@ class FacebookfinishloginAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_is_real_login()) {

4
plugins/FacebookBridge/actions/facebooklogin.php
View File

@ -34,9 +34,9 @@ if (!defined('STATUSNET')) {
class FacebookloginAction extends Action
{
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_is_real_login()) {
// TRANS: Client error displayed when trying to login while already logged in.

6
plugins/Favorite/actions/apifavoritedestroy.php
View File

@ -57,7 +57,7 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
*
* @return boolean success flag
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -82,9 +82,9 @@ class ApiFavoriteDestroyAction extends ApiAuthAction
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($_SERVER['REQUEST_METHOD'] != 'POST') {
$this->clientError(

6
plugins/Favorite/actions/favorited.php
View File

@ -95,7 +95,7 @@ class FavoritedAction extends Action
*
* @todo move queries from showContent() to here
*/
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@ -114,9 +114,9 @@ class FavoritedAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
plugins/GNUsocialPhoto/actions/newphoto.php
View File

@ -33,7 +33,7 @@ class NewphotoAction extends Action
{
var $user = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->user = common_current_user();
@ -50,9 +50,9 @@ class NewphotoAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($this->isPost()) {
$this->handlePost($args);

6
plugins/GNUsocialPhotos/actions/editphoto.php
View File

@ -36,7 +36,7 @@ class EditphotoAction extends Action
{
var $user = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$args = $this->returnToArgs();
@ -46,9 +46,9 @@ class EditphotoAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();
}

6
plugins/GNUsocialPhotos/actions/photos.php
View File

@ -38,7 +38,7 @@ class PhotosAction extends Action
{
var $user = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -53,9 +53,9 @@ class PhotosAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
plugins/GNUsocialPhotos/actions/photoupload.php
View File

@ -36,16 +36,16 @@ class PhotouploadAction extends Action
{
var $user = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->user = common_current_user();
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->handlePost();
}

6
plugins/GNUsocialProfileExtensions/actions/bio.php
View File

@ -38,7 +38,7 @@ class BioAction extends Action
{
var $user = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -51,9 +51,9 @@ class BioAction extends Action
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

6
plugins/GNUsocialVideo/actions/postvideo.php
View File

@ -34,7 +34,7 @@ class PostvideoAction extends Action {
var $user = null;
var $url = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->user = common_current_user();
@ -54,9 +54,9 @@ class PostvideoAction extends Action {
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if ($this->isPost()) {
$this->handlePost($args);

2
plugins/GNUsocialVideo/actions/showvideo.php
View File

@ -34,7 +34,7 @@ class ShowvideoAction extends ShownoticeAction
protected $id = null;
protected $vid = null;
function prepare($args)
function prepare(array $args = array())
{
OwnerDesignAction::prepare($args);
$this->id = $this->trimmed('id');

2
plugins/LinkPreview/actions/oembedproxy.php
View File

@ -46,7 +46,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/
class OembedproxyAction extends OembedAction
{
function handle($args)
function handle()
{
// Trigger short error responses; not a human-readable web page.
GNUsocial::setApi(true);

2
plugins/Mapstraction/actions/allmap.php
View File

@ -42,7 +42,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
*/
class AllmapAction extends MapAction
{
function prepare($args)
function prepare(array $args = array())
{
if (parent::prepare($args)) {
$stream = new InboxNoticeStream($this->user->getProfile(), $this->scoped);

6
plugins/Mapstraction/actions/map.php
View File

@ -48,7 +48,7 @@ class MapAction extends Action
var $page = null;
var $notices = null;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
@ -94,9 +94,9 @@ class MapAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$this->showPage();
}

2
plugins/Mapstraction/actions/usermap.php
View File

@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
*/
class UsermapAction extends MapAction
{
function prepare($args)
function prepare(array $args = array())
{
if(parent::prepare($args)) {
$this->notice = empty($this->tag)

2
plugins/OStatus/actions/ostatustag.php
View File

@ -31,7 +31,7 @@ class OStatusTagAction extends OStatusInitAction
var $profile;
var $err;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);

4
plugins/OpenID/actions/finishaddopenid.php
View File

@ -58,9 +58,9 @@ class FinishaddopenidAction extends Action
*
* @return void
*/
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (!common_logged_in()) {
// TRANS: Error message displayed when trying to perform an action that requires a logged in user.
$this->clientError(_m('Not logged in.'));

4
plugins/OpenID/actions/finishopenidlogin.php
View File

@ -29,9 +29,9 @@ class FinishopenidloginAction extends Action
var $username = null;
var $message = null;
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_is_real_login()) {
// TRANS: Client error message trying to log on with OpenID while already logged on.
$this->clientError(_m('Already logged in.'));

4
plugins/OpenID/actions/openidlogin.php
View File

@ -25,9 +25,9 @@ require_once INSTALLDIR.'/plugins/OpenID/openid.php';
class OpenidloginAction extends Action
{
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if (common_is_real_login()) {
// TRANS: Client error message trying to log on with OpenID while already logged on.
$this->clientError(_m('Already logged in.'));

6
plugins/OpenID/actions/openidserver.php
View File

@ -50,16 +50,16 @@ class OpenidserverAction extends Action
{
var $oserver;
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
$this->oserver = oid_server();
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
$request = $this->oserver->decodeRequest();
if (in_array($request->mode, array('checkid_immediate',
'checkid_setup'))) {

6
plugins/OpenID/actions/openidtrust.php
View File

@ -51,7 +51,7 @@ class OpenidtrustAction extends Action
return _m('OpenID Identity Verification');
}
function prepare($args)
function prepare(array $args = array())
{
parent::prepare($args);
common_ensure_session();
@ -71,9 +71,9 @@ class OpenidtrustAction extends Action
return true;
}
function handle($args)
function handle()
{
parent::handle($args);
parent::handle();
if($_SERVER['REQUEST_METHOD'] == 'POST'){
$this->handleSubmit();
}else{

Some files were not shown because too many files have changed in this diff Show More