From: Chimo Date: Wed, 1 Jun 2016 02:05:11 +0000 (+0000) Subject: Update handle() method on Action subclasses. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ba2975aac859ca9aebf809b1dd567585da69df37;p=quix0rs-gnu-social.git Update handle() method on Action subclasses. Fixes handle()-related strict warnings such as "Strict Standards: Declaration of AdminPanelAction::handle() should be compatible with Action::handle()" Ref. #190 --- diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php index b501ce0fd9..3de29d54a2 100644 --- a/actions/addpeopletag.php +++ b/actions/addpeopletag.php @@ -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, diff --git a/actions/apiaccountupdatedeliverydevice.php b/actions/apiaccountupdatedeliverydevice.php index a3cbb418b6..d2f137077d 100644 --- a/actions/apiaccountupdatedeliverydevice.php +++ b/actions/apiaccountupdatedeliverydevice.php @@ -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( diff --git a/actions/apiatomservice.php b/actions/apiatomservice.php index 9e45a30fcc..87a39b56a3 100644 --- a/actions/apiatomservice.php +++ b/actions/apiatomservice.php @@ -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'); diff --git a/actions/apigrouplistall.php b/actions/apigrouplistall.php index 2fb3714257..932e524ae1 100644 --- a/actions/apigrouplistall.php +++ b/actions/apigrouplistall.php @@ -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. diff --git a/actions/apilistsubscriber.php b/actions/apilistsubscriber.php index f5cda15ae9..21c0b20b74 100644 --- a/actions/apilistsubscriber.php +++ b/actions/apilistsubscriber.php @@ -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); diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index a1a70a9b9e..8dd0a40b22 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -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); diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index d0dcf9c9c7..6c93d47ccd 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -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') { diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php index e961f4f464..b85ca70c47 100644 --- a/actions/apioauthrequesttoken.php +++ b/actions/apioauthrequesttoken.php @@ -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); diff --git a/actions/apisearchatom.php b/actions/apisearchatom.php index 7e79808a96..fca745c1fd 100644 --- a/actions/apisearchatom.php +++ b/actions/apisearchatom.php @@ -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(); } diff --git a/actions/apisearchjson.php b/actions/apisearchjson.php index 794f23077b..cec826c016 100644 --- a/actions/apisearchjson.php +++ b/actions/apisearchjson.php @@ -95,9 +95,9 @@ class ApiSearchJSONAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showResults(); } diff --git a/actions/apitrends.php b/actions/apitrends.php index a39769a34e..79bd452dba 100644 --- a/actions/apitrends.php +++ b/actions/apitrends.php @@ -66,9 +66,9 @@ class ApiTrendsAction extends ApiPrivateAuthAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showTrends(); } diff --git a/actions/approvegroup.php b/actions/approvegroup.php index 2c8b354d34..18f62d28b1 100644 --- a/actions/approvegroup.php +++ b/actions/approvegroup.php @@ -139,9 +139,9 @@ class ApprovegroupAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); try { if ($this->approve) { diff --git a/actions/approvesub.php b/actions/approvesub.php index c9fa804412..aa8c23bf7d 100644 --- a/actions/approvesub.php +++ b/actions/approvesub.php @@ -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 { diff --git a/actions/block.php b/actions/block.php index 53d8ae7ae0..5a8996f807 100644 --- a/actions/block.php +++ b/actions/block.php @@ -78,7 +78,7 @@ class BlockAction extends ProfileFormAction * * @return void */ - function handle($args) + function handle() { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { diff --git a/actions/cancelgroup.php b/actions/cancelgroup.php index 93f630e060..02e9493551 100644 --- a/actions/cancelgroup.php +++ b/actions/cancelgroup.php @@ -127,9 +127,9 @@ class CancelgroupAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); try { $this->request->abort(); diff --git a/actions/deleteapplication.php b/actions/deleteapplication.php index 5d7441098c..297ddc54bc 100644 --- a/actions/deleteapplication.php +++ b/actions/deleteapplication.php @@ -89,7 +89,7 @@ class DeleteapplicationAction extends Action * * @return void */ - function handle($args) + function handle() { if ($_SERVER['REQUEST_METHOD'] == 'POST') { diff --git a/actions/deletegroup.php b/actions/deletegroup.php index c64bc1d8e9..aacfe35bde 100644 --- a/actions/deletegroup.php +++ b/actions/deletegroup.php @@ -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(); diff --git a/actions/deleteuser.php b/actions/deleteuser.php index 6e0c6ebf7f..d1b73f4746 100644 --- a/actions/deleteuser.php +++ b/actions/deleteuser.php @@ -80,7 +80,7 @@ class DeleteuserAction extends ProfileFormAction * * @return void */ - function handle($args) + function handle() { if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($this->arg('no')) { diff --git a/actions/editapplication.php b/actions/editapplication.php index c7e5f9052c..c0e27d86fb 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -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); diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php index 45c8adaa7d..02dc06180d 100644 --- a/actions/editpeopletag.php +++ b/actions/editpeopletag.php @@ -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 { diff --git a/actions/featured.php b/actions/featured.php index 394cfe6a8b..a30d5867a4 100644 --- a/actions/featured.php +++ b/actions/featured.php @@ -74,9 +74,9 @@ class FeaturedAction extends Action } } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/foafgroup.php b/actions/foafgroup.php index f9c61ac5dc..57303cf362 100644 --- a/actions/foafgroup.php +++ b/actions/foafgroup.php @@ -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'); diff --git a/actions/geocode.php b/actions/geocode.php index 9e208914c1..6e4d1ce0f4 100644 --- a/actions/geocode.php +++ b/actions/geocode.php @@ -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(); diff --git a/actions/groupblock.php b/actions/groupblock.php index d65b62bdff..4bf5d74c20 100644 --- a/actions/groupblock.php +++ b/actions/groupblock.php @@ -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(); diff --git a/actions/groups.php b/actions/groups.php index d1bc8d9458..258fee262b 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -74,9 +74,9 @@ class GroupsAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/groupunblock.php b/actions/groupunblock.php index a24177f64c..7a4853aa37 100644 --- a/actions/groupunblock.php +++ b/actions/groupunblock.php @@ -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(); } diff --git a/actions/invite.php b/actions/invite.php index 89b7e83bf6..827e026696 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -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.')); diff --git a/actions/makeadmin.php b/actions/makeadmin.php index 05912e150c..8c88d4cd69 100644 --- a/actions/makeadmin.php +++ b/actions/makeadmin.php @@ -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(); } diff --git a/actions/nudge.php b/actions/nudge.php index 801d1f0681..8ade7fa272 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -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. diff --git a/actions/opensearch.php b/actions/opensearch.php index b1529860a8..b7ed3212c2 100644 --- a/actions/opensearch.php +++ b/actions/opensearch.php @@ -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') { diff --git a/actions/otp.php b/actions/otp.php index c44f3673ae..c5f3e70b26 100644 --- a/actions/otp.php +++ b/actions/otp.php @@ -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)) { diff --git a/actions/peopletag.php b/actions/peopletag.php index b0a6e2635d..007e722a0b 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -84,9 +84,9 @@ class PeopletagAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/peopletagautocomplete.php b/actions/peopletagautocomplete.php index c239c03bfb..c165b40805 100644 --- a/actions/peopletagautocomplete.php +++ b/actions/peopletagautocomplete.php @@ -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) { diff --git a/actions/peopletagged.php b/actions/peopletagged.php index cf9ec053ed..d82a448ce5 100644 --- a/actions/peopletagged.php +++ b/actions/peopletagged.php @@ -117,9 +117,9 @@ class PeopletaggedAction extends Action } } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php index 4a04ea2fbb..0b85bf2956 100644 --- a/actions/peopletagsbyuser.php +++ b/actions/peopletagsbyuser.php @@ -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 diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php index 7679be0b86..909969db22 100644 --- a/actions/peopletagsforuser.php +++ b/actions/peopletagsforuser.php @@ -95,9 +95,9 @@ class PeopletagsforuserAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/peopletagsubscribers.php b/actions/peopletagsubscribers.php index 589d49caa3..354f2deb0e 100644 --- a/actions/peopletagsubscribers.php +++ b/actions/peopletagsubscribers.php @@ -117,9 +117,9 @@ class PeopletagsubscribersAction extends Action } } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php index 64edd09290..2be9187b9e 100644 --- a/actions/peopletagsubscriptions.php +++ b/actions/peopletagsubscriptions.php @@ -97,9 +97,9 @@ class PeopletagsubscriptionsAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/pluginenable.php b/actions/pluginenable.php index 707cbdecaa..da36f0995f 100644 --- a/actions/pluginenable.php +++ b/actions/pluginenable.php @@ -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()); diff --git a/actions/profilecompletion.php b/actions/profilecompletion.php index aaf6026eb5..a931d6aead 100644 --- a/actions/profilecompletion.php +++ b/actions/profilecompletion.php @@ -120,7 +120,7 @@ class ProfilecompletionAction extends Action * @return void */ - function handle($args) + function handle() { $this->msg = null; diff --git a/actions/profiletagbyid.php b/actions/profiletagbyid.php index ce7298a2f6..4804e35c83 100644 --- a/actions/profiletagbyid.php +++ b/actions/profiletagbyid.php @@ -83,7 +83,7 @@ class ProfiletagbyidAction extends Action * * @return void */ - function handle($args) + function handle() { common_redirect($this->peopletag->homeUrl(), 303); } diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php index db8185bb13..e557b75fd0 100644 --- a/actions/publictagcloud.php +++ b/actions/publictagcloud.php @@ -92,9 +92,9 @@ class PublictagcloudAction extends Action $this->elementEnd('div'); } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php index d19ed4693c..f3192b5dd3 100644 --- a/actions/recoverpassword.php +++ b/actions/recoverpassword.php @@ -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!')); diff --git a/actions/redirect.php b/actions/redirect.php index 9cb03708db..1fb952da41 100644 --- a/actions/redirect.php +++ b/actions/redirect.php @@ -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'))); } diff --git a/actions/register.php b/actions/register.php index 97f0e19cfd..6f23244d13 100644 --- a/actions/register.php +++ b/actions/register.php @@ -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. diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php index 8192e86b44..529bcbcb17 100644 --- a/actions/removepeopletag.php +++ b/actions/removepeopletag.php @@ -120,7 +120,7 @@ class RemovepeopletagAction extends Action * * @return void */ - function handle($args) + function handle() { // Throws exception on error diff --git a/actions/rsd.php b/actions/rsd.php index bd8042f0cd..92cf8b95e3 100644 --- a/actions/rsd.php +++ b/actions/rsd.php @@ -126,7 +126,7 @@ class RsdAction extends Action * * @return nothing */ - function handle($args) + function handle() { header('Content-Type: application/rsd+xml'); diff --git a/actions/showapplication.php b/actions/showapplication.php index d8ac293d40..ecc3b268fe 100644 --- a/actions/showapplication.php +++ b/actions/showapplication.php @@ -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') { diff --git a/actions/subedit.php b/actions/subedit.php index 47fe19ea24..9e779c4f06 100644 --- a/actions/subedit.php +++ b/actions/subedit.php @@ -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(); diff --git a/actions/subscribe.php b/actions/subscribe.php index 320409afa0..f8b6093bbd 100644 --- a/actions/subscribe.php +++ b/actions/subscribe.php @@ -118,7 +118,7 @@ class SubscribeAction extends Action * * @return void */ - function handle($args) + function handle() { // Throws exception on error diff --git a/actions/subscribepeopletag.php b/actions/subscribepeopletag.php index b83ff70010..e9d4cbcc37 100644 --- a/actions/subscribepeopletag.php +++ b/actions/subscribepeopletag.php @@ -106,9 +106,9 @@ class SubscribepeopletagAction extends Action * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $cur = common_current_user(); diff --git a/actions/sup.php b/actions/sup.php index 911f0d9e55..5e26e8b106 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -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'); diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php index 4b85ba427c..524fbea284 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -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.')); diff --git a/actions/unsubscribepeopletag.php b/actions/unsubscribepeopletag.php index b5757ad6fd..7d9925720d 100644 --- a/actions/unsubscribepeopletag.php +++ b/actions/unsubscribepeopletag.php @@ -106,9 +106,9 @@ class UnsubscribepeopletagAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $cur = common_current_user(); diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php index a7cb9fc722..322c6d7358 100644 --- a/lib/adminpanelaction.php +++ b/lib/adminpanelaction.php @@ -119,7 +119,7 @@ class AdminPanelAction extends Action * * @return void */ - function handle($args) + function handle() { if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->checkSessionToken(); diff --git a/lib/profileformaction.php b/lib/profileformaction.php index 1e00e6f12b..e340627e9d 100644 --- a/lib/profileformaction.php +++ b/lib/profileformaction.php @@ -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 { diff --git a/lib/searchaction.php b/lib/searchaction.php index aea8860356..5ede78d414 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -56,9 +56,9 @@ class SearchAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/AccountManager/actions/accountmanagementcontroldocument.php b/plugins/AccountManager/actions/accountmanagementcontroldocument.php index 955779b4ee..8f9eca61de 100644 --- a/plugins/AccountManager/actions/accountmanagementcontroldocument.php +++ b/plugins/AccountManager/actions/accountmanagementcontroldocument.php @@ -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'); diff --git a/plugins/AccountManager/actions/accountmanagementsessionstatus.php b/plugins/AccountManager/actions/accountmanagementsessionstatus.php index 9eeff72402..af8dbffc93 100644 --- a/plugins/AccountManager/actions/accountmanagementsessionstatus.php +++ b/plugins/AccountManager/actions/accountmanagementsessionstatus.php @@ -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)) { diff --git a/plugins/ActivitySpam/actions/spam.php b/plugins/ActivitySpam/actions/spam.php index 00a1e0b8a1..fa2e5737c7 100644 --- a/plugins/ActivitySpam/actions/spam.php +++ b/plugins/ActivitySpam/actions/spam.php @@ -106,7 +106,7 @@ class SpamAction extends Action function handle($argarray=null) { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/AnonymousFave/actions/anondisfavor.php b/plugins/AnonymousFave/actions/anondisfavor.php index 6b0fae82c1..82b9ac5917 100644 --- a/plugins/AnonymousFave/actions/anondisfavor.php +++ b/plugins/AnonymousFave/actions/anondisfavor.php @@ -47,9 +47,9 @@ class AnonDisfavorAction extends RedirectingAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $profile = AnonymousFavePlugin::getAnonProfile(); diff --git a/plugins/AnonymousFave/actions/anonfavor.php b/plugins/AnonymousFave/actions/anonfavor.php index 287c25cbe9..114810ae71 100644 --- a/plugins/AnonymousFave/actions/anonfavor.php +++ b/plugins/AnonymousFave/actions/anonfavor.php @@ -47,9 +47,9 @@ class AnonFavorAction extends RedirectingAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $profile = AnonymousFavePlugin::getAnonProfile(); diff --git a/plugins/Bookmark/actions/apitimelinebookmarks.php b/plugins/Bookmark/actions/apitimelinebookmarks.php index ee43617127..2376e994ac 100644 --- a/plugins/Bookmark/actions/apitimelinebookmarks.php +++ b/plugins/Bookmark/actions/apitimelinebookmarks.php @@ -82,9 +82,9 @@ class ApiTimelineBookmarksAction extends ApiBareAuthAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showTimeline(); } diff --git a/plugins/Bookmark/actions/bookmarks.php b/plugins/Bookmark/actions/bookmarks.php index 6c79fa1d02..0c908a2ca8 100644 --- a/plugins/Bookmark/actions/bookmarks.php +++ b/plugins/Bookmark/actions/bookmarks.php @@ -107,9 +107,9 @@ class BookmarksAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/CasAuthentication/actions/caslogin.php b/plugins/CasAuthentication/actions/caslogin.php index 09377c62eb..7310072d92 100644 --- a/plugins/CasAuthentication/actions/caslogin.php +++ b/plugins/CasAuthentication/actions/caslogin.php @@ -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.')); diff --git a/plugins/ClientSideShorten/actions/shorten.php b/plugins/ClientSideShorten/actions/shorten.php index 6840d532aa..8351839cdb 100644 --- a/plugins/ClientSideShorten/actions/shorten.php +++ b/plugins/ClientSideShorten/actions/shorten.php @@ -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; diff --git a/plugins/DirectMessage/actions/showmessage.php b/plugins/DirectMessage/actions/showmessage.php index 86fbee8b73..f7dc3731b4 100644 --- a/plugins/DirectMessage/actions/showmessage.php +++ b/plugins/DirectMessage/actions/showmessage.php @@ -89,7 +89,7 @@ class ShowmessageAction extends Action return true; } - function handle($args) + function handle() { $this->showPage(); } diff --git a/plugins/DirectMessage/lib/mailboxaction.php b/plugins/DirectMessage/lib/mailboxaction.php index 3c7281e985..fd2e1fabc4 100644 --- a/plugins/DirectMessage/lib/mailboxaction.php +++ b/plugins/DirectMessage/lib/mailboxaction.php @@ -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. diff --git a/plugins/Event/actions/timelist.php b/plugins/Event/actions/timelist.php index 092fa6bda5..c24613a8d4 100644 --- a/plugins/Event/actions/timelist.php +++ b/plugins/Event/actions/timelist.php @@ -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. diff --git a/plugins/ExtendedProfile/actions/userautocomplete.php b/plugins/ExtendedProfile/actions/userautocomplete.php index d4857429e0..9c3afbd106 100644 --- a/plugins/ExtendedProfile/actions/userautocomplete.php +++ b/plugins/ExtendedProfile/actions/userautocomplete.php @@ -57,9 +57,9 @@ class UserautocompleteAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showResults(); } diff --git a/plugins/FacebookBridge/actions/facebookdeauthorize.php b/plugins/FacebookBridge/actions/facebookdeauthorize.php index 443b768f5c..9173850ca5 100644 --- a/plugins/FacebookBridge/actions/facebookdeauthorize.php +++ b/plugins/FacebookBridge/actions/facebookdeauthorize.php @@ -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(); diff --git a/plugins/FacebookBridge/actions/facebookfinishlogin.php b/plugins/FacebookBridge/actions/facebookfinishlogin.php index 7cf493a994..93d4aaeacd 100644 --- a/plugins/FacebookBridge/actions/facebookfinishlogin.php +++ b/plugins/FacebookBridge/actions/facebookfinishlogin.php @@ -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()) { diff --git a/plugins/FacebookBridge/actions/facebooklogin.php b/plugins/FacebookBridge/actions/facebooklogin.php index f30822b63f..c79b74654f 100644 --- a/plugins/FacebookBridge/actions/facebooklogin.php +++ b/plugins/FacebookBridge/actions/facebooklogin.php @@ -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. diff --git a/plugins/Favorite/actions/apifavoritedestroy.php b/plugins/Favorite/actions/apifavoritedestroy.php index 1c63ad2628..cf5659978a 100644 --- a/plugins/Favorite/actions/apifavoritedestroy.php +++ b/plugins/Favorite/actions/apifavoritedestroy.php @@ -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( diff --git a/plugins/Favorite/actions/favorited.php b/plugins/Favorite/actions/favorited.php index 8c2871dc3c..dbd0ebe5bf 100644 --- a/plugins/Favorite/actions/favorited.php +++ b/plugins/Favorite/actions/favorited.php @@ -114,9 +114,9 @@ class FavoritedAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/GNUsocialPhoto/actions/newphoto.php b/plugins/GNUsocialPhoto/actions/newphoto.php index 18ae5523a0..4f9f293e96 100644 --- a/plugins/GNUsocialPhoto/actions/newphoto.php +++ b/plugins/GNUsocialPhoto/actions/newphoto.php @@ -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); diff --git a/plugins/GNUsocialPhotos/actions/editphoto.php b/plugins/GNUsocialPhotos/actions/editphoto.php index 35dac7bf3f..db36813f27 100644 --- a/plugins/GNUsocialPhotos/actions/editphoto.php +++ b/plugins/GNUsocialPhotos/actions/editphoto.php @@ -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(); } diff --git a/plugins/GNUsocialPhotos/actions/photos.php b/plugins/GNUsocialPhotos/actions/photos.php index b1e1b73ff1..082736cd21 100644 --- a/plugins/GNUsocialPhotos/actions/photos.php +++ b/plugins/GNUsocialPhotos/actions/photos.php @@ -53,9 +53,9 @@ class PhotosAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/GNUsocialPhotos/actions/photoupload.php b/plugins/GNUsocialPhotos/actions/photoupload.php index 25bd4f84d0..6dd5f9aef1 100644 --- a/plugins/GNUsocialPhotos/actions/photoupload.php +++ b/plugins/GNUsocialPhotos/actions/photoupload.php @@ -43,9 +43,9 @@ class PhotouploadAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); if($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); } diff --git a/plugins/GNUsocialProfileExtensions/actions/bio.php b/plugins/GNUsocialProfileExtensions/actions/bio.php index 269389e07d..3022e6e761 100644 --- a/plugins/GNUsocialProfileExtensions/actions/bio.php +++ b/plugins/GNUsocialProfileExtensions/actions/bio.php @@ -51,9 +51,9 @@ class BioAction extends Action } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/GNUsocialVideo/actions/postvideo.php b/plugins/GNUsocialVideo/actions/postvideo.php index bdd86abc9e..729afc5d2d 100644 --- a/plugins/GNUsocialVideo/actions/postvideo.php +++ b/plugins/GNUsocialVideo/actions/postvideo.php @@ -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); diff --git a/plugins/LinkPreview/actions/oembedproxy.php b/plugins/LinkPreview/actions/oembedproxy.php index 97b0942441..e36239216a 100644 --- a/plugins/LinkPreview/actions/oembedproxy.php +++ b/plugins/LinkPreview/actions/oembedproxy.php @@ -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); diff --git a/plugins/Mapstraction/actions/map.php b/plugins/Mapstraction/actions/map.php index 75a065a26a..0a5334103e 100644 --- a/plugins/Mapstraction/actions/map.php +++ b/plugins/Mapstraction/actions/map.php @@ -94,9 +94,9 @@ class MapAction extends Action return true; } - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/OpenID/actions/finishaddopenid.php b/plugins/OpenID/actions/finishaddopenid.php index 5182e50778..e3e100c9e4 100644 --- a/plugins/OpenID/actions/finishaddopenid.php +++ b/plugins/OpenID/actions/finishaddopenid.php @@ -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.')); diff --git a/plugins/OpenID/actions/finishopenidlogin.php b/plugins/OpenID/actions/finishopenidlogin.php index 3a99988fb5..f91d10d252 100644 --- a/plugins/OpenID/actions/finishopenidlogin.php +++ b/plugins/OpenID/actions/finishopenidlogin.php @@ -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.')); diff --git a/plugins/OpenID/actions/openidlogin.php b/plugins/OpenID/actions/openidlogin.php index 86ebcae2e1..b06189e2fd 100644 --- a/plugins/OpenID/actions/openidlogin.php +++ b/plugins/OpenID/actions/openidlogin.php @@ -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.')); diff --git a/plugins/OpenID/actions/openidserver.php b/plugins/OpenID/actions/openidserver.php index d4bb6e25f4..acab0938b8 100644 --- a/plugins/OpenID/actions/openidserver.php +++ b/plugins/OpenID/actions/openidserver.php @@ -57,9 +57,9 @@ class OpenidserverAction extends Action 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'))) { diff --git a/plugins/OpenID/actions/openidtrust.php b/plugins/OpenID/actions/openidtrust.php index 3f8a3a93b7..3c0e24981f 100644 --- a/plugins/OpenID/actions/openidtrust.php +++ b/plugins/OpenID/actions/openidtrust.php @@ -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{ diff --git a/plugins/OpenID/openid.php b/plugins/OpenID/openid.php index ee854e8140..c96248ad0f 100644 --- a/plugins/OpenID/openid.php +++ b/plugins/OpenID/openid.php @@ -359,9 +359,9 @@ class AutosubmitAction extends Action var $form_html = null; var $form_id = null; - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/RSSCloud/actions/loggingaggregator.php b/plugins/RSSCloud/actions/loggingaggregator.php index 824fa9ee9c..a50e99011c 100644 --- a/plugins/RSSCloud/actions/loggingaggregator.php +++ b/plugins/RSSCloud/actions/loggingaggregator.php @@ -77,9 +77,9 @@ class LoggingAggregatorAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); if (empty($this->url)) { // TRANS: Form validation error displayed when a URL parameter is missing. diff --git a/plugins/RSSCloud/actions/rsscloudrequestnotify.php b/plugins/RSSCloud/actions/rsscloudrequestnotify.php index 7fd6da0509..4656fc9650 100644 --- a/plugins/RSSCloud/actions/rsscloudrequestnotify.php +++ b/plugins/RSSCloud/actions/rsscloudrequestnotify.php @@ -82,9 +82,9 @@ class RSSCloudRequestNotifyAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); if ($_SERVER['REQUEST_METHOD'] != 'POST') { // TRANS: Form validation error displayed when POST is not used. diff --git a/plugins/Sample/actions/hello.php b/plugins/Sample/actions/hello.php index da5682b332..c0bde93d7d 100644 --- a/plugins/Sample/actions/hello.php +++ b/plugins/Sample/actions/hello.php @@ -91,9 +91,9 @@ class HelloAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/SearchSub/actions/searchsub.php b/plugins/SearchSub/actions/searchsub.php index 586f2252f6..ae1e1550ae 100644 --- a/plugins/SearchSub/actions/searchsub.php +++ b/plugins/SearchSub/actions/searchsub.php @@ -118,7 +118,7 @@ class SearchsubAction extends Action * * @return void */ - function handle($args) + function handle() { // Throws exception on error diff --git a/plugins/SearchSub/actions/searchunsub.php b/plugins/SearchSub/actions/searchunsub.php index a6ce0f07c5..1bc3a1c95b 100644 --- a/plugins/SearchSub/actions/searchunsub.php +++ b/plugins/SearchSub/actions/searchunsub.php @@ -62,7 +62,7 @@ class SearchunsubAction extends SearchsubAction * * @return void */ - function handle($args) + function handle() { // Throws exception on error diff --git a/plugins/Share/actions/apistatusesretweets.php b/plugins/Share/actions/apistatusesretweets.php index 7af4cd3ec6..9a75aa8918 100644 --- a/plugins/Share/actions/apistatusesretweets.php +++ b/plugins/Share/actions/apistatusesretweets.php @@ -89,9 +89,9 @@ class ApiStatusesRetweetsAction extends ApiAuthAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $strm = $this->original->repeatStream($this->cnt); diff --git a/plugins/Share/actions/apitimelineretweetsofme.php b/plugins/Share/actions/apitimelineretweetsofme.php index fe90213665..58c6886af6 100644 --- a/plugins/Share/actions/apitimelineretweetsofme.php +++ b/plugins/Share/actions/apitimelineretweetsofme.php @@ -83,9 +83,9 @@ class ApiTimelineRetweetsOfMeAction extends ApiAuthAction * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $offset = ($this->page-1) * $this->cnt; $limit = $this->cnt; diff --git a/plugins/Sitemap/actions/sitemap.php b/plugins/Sitemap/actions/sitemap.php index ef77645c31..16c2014efd 100644 --- a/plugins/Sitemap/actions/sitemap.php +++ b/plugins/Sitemap/actions/sitemap.php @@ -49,9 +49,9 @@ class SitemapAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); header('Content-Type: text/xml; charset=UTF-8'); $this->startXML(); diff --git a/plugins/Sitemap/actions/sitemapindex.php b/plugins/Sitemap/actions/sitemapindex.php index ab89c2156c..09e3c805e0 100644 --- a/plugins/Sitemap/actions/sitemapindex.php +++ b/plugins/Sitemap/actions/sitemapindex.php @@ -49,7 +49,7 @@ class SitemapindexAction extends Action * * @return void */ - function handle($args) + function handle() { header('Content-Type: text/xml; charset=UTF-8'); $this->startXML(); diff --git a/plugins/TagSub/actions/tagsub.php b/plugins/TagSub/actions/tagsub.php index de333c8f58..f9ecaa94af 100644 --- a/plugins/TagSub/actions/tagsub.php +++ b/plugins/TagSub/actions/tagsub.php @@ -118,7 +118,7 @@ class TagsubAction extends Action * * @return void */ - function handle($args) + function handle() { // Throws exception on error diff --git a/plugins/TagSub/actions/tagunsub.php b/plugins/TagSub/actions/tagunsub.php index 43afab08e3..4e04a55b95 100644 --- a/plugins/TagSub/actions/tagunsub.php +++ b/plugins/TagSub/actions/tagunsub.php @@ -62,7 +62,7 @@ class TagunsubAction extends TagsubAction * * @return void */ - function handle($args) + function handle() { // Throws exception on error diff --git a/plugins/UserFlag/actions/adminprofileflag.php b/plugins/UserFlag/actions/adminprofileflag.php index 9b5b4088bf..708bd99d29 100644 --- a/plugins/UserFlag/actions/adminprofileflag.php +++ b/plugins/UserFlag/actions/adminprofileflag.php @@ -107,9 +107,9 @@ class AdminprofileflagAction extends Action * * @return void */ - function handle($args) + function handle() { - parent::handle($args); + parent::handle(); $this->showPage(); } diff --git a/plugins/UserFlag/actions/clearflag.php b/plugins/UserFlag/actions/clearflag.php index c2443d6d58..28152fb079 100644 --- a/plugins/UserFlag/actions/clearflag.php +++ b/plugins/UserFlag/actions/clearflag.php @@ -73,7 +73,7 @@ class ClearflagAction extends ProfileFormAction * * @return void */ - function handle($args) + function handle() { if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost(); diff --git a/plugins/UserFlag/actions/flagprofile.php b/plugins/UserFlag/actions/flagprofile.php index 4c4dc46f60..ec036fc064 100644 --- a/plugins/UserFlag/actions/flagprofile.php +++ b/plugins/UserFlag/actions/flagprofile.php @@ -73,7 +73,7 @@ class FlagprofileAction extends ProfileFormAction * * @return void */ - function handle($args) + function handle() { if ($_SERVER['REQUEST_METHOD'] == 'POST') { $this->handlePost();