From f46d675a20bd1c70eeb492d7068fabae83e6a6f5 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Tue, 15 Oct 2013 00:20:36 +0200 Subject: [PATCH] GNU social is with a minor s. --- actions/apiaccountregister.php | 2 +- actions/apiaccountupdatebackgroundcolor.php | 2 +- actions/apiaccountupdatelinkcolor.php | 2 +- actions/apiattachment.php | 2 +- actions/apicheckhub.php | 2 +- actions/apichecknickname.php | 2 +- actions/apiexternalprofileshow.php | 2 +- actions/apigroupadmins.php | 4 ++-- actions/apioauthaccesstoken.php | 2 +- actions/apioauthauthorize.php | 2 +- actions/apioauthrequesttoken.php | 2 +- actions/apisearchjson.php | 2 +- actions/apistatusesfavs.php | 2 +- actions/avatarbynickname.php | 2 +- actions/disfavor.php | 4 ++-- actions/favor.php | 4 ++-- actions/oauthconnectionssettings.php | 2 +- classes/Profile_prefs.php | 2 +- extlib/README | 2 +- lib/apiauthaction.php | 2 +- lib/apignusocialoauthdatastore.php | 2 +- lib/disfavorform.php | 4 ++-- lib/favorform.php | 4 ++-- lib/filenotfoundexception.php | 2 +- lib/httpclient.php | 16 ++++++++-------- lib/invalidurlexception.php | 2 +- lib/noavatarexception.php | 2 +- lib/noresultexception.php | 2 +- plugins/GNUsocialPhotos/actions/photos.php | 2 +- plugins/LRDD/LRDDPlugin.php | 2 +- plugins/LRDD/lib/discovery.php | 2 +- plugins/LRDD/lib/lrddmethod/webfinger.php | 2 +- plugins/WebFinger/WebFingerPlugin.php | 2 +- plugins/WebFinger/lib/webfinger.php | 2 +- 34 files changed, 46 insertions(+), 46 deletions(-) diff --git a/actions/apiaccountregister.php b/actions/apiaccountregister.php index 15a62d3971..9ce7bcfb68 100644 --- a/actions/apiaccountregister.php +++ b/actions/apiaccountregister.php @@ -21,7 +21,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apiaccountupdatebackgroundcolor.php b/actions/apiaccountupdatebackgroundcolor.php index 8d2a97228c..0588ece730 100644 --- a/actions/apiaccountupdatebackgroundcolor.php +++ b/actions/apiaccountupdatebackgroundcolor.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apiaccountupdatelinkcolor.php b/actions/apiaccountupdatelinkcolor.php index 49c42204b4..076ab234a0 100644 --- a/actions/apiaccountupdatelinkcolor.php +++ b/actions/apiaccountupdatelinkcolor.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apiattachment.php b/actions/apiattachment.php index b3d8cc80b9..0a0b342990 100644 --- a/actions/apiattachment.php +++ b/actions/apiattachment.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apicheckhub.php b/actions/apicheckhub.php index ed7f39baec..bad4031f07 100644 --- a/actions/apicheckhub.php +++ b/actions/apicheckhub.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apichecknickname.php b/actions/apichecknickname.php index 9aa834ab26..b0e1c1c1db 100644 --- a/actions/apichecknickname.php +++ b/actions/apichecknickname.php @@ -23,7 +23,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apiexternalprofileshow.php b/actions/apiexternalprofileshow.php index 8a007e18b3..5abb2e3c74 100644 --- a/actions/apiexternalprofileshow.php +++ b/actions/apiexternalprofileshow.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/apigroupadmins.php b/actions/apigroupadmins.php index cba9c08ab3..c1f28e4a2d 100644 --- a/actions/apigroupadmins.php +++ b/actions/apigroupadmins.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Craig Andrews * @author Evan Prodromou * @author Jeffery To @@ -40,7 +40,7 @@ if (!defined('GNUSOCIAL')) { * List 20 newest admins of the group specified by name or ID. * * @category API - * @package GNUSocial + * @package GNUsocial * @author Craig Andrews * @author Evan Prodromou * @author Jeffery To diff --git a/actions/apioauthaccesstoken.php b/actions/apioauthaccesstoken.php index f3d64de225..9379834d65 100644 --- a/actions/apioauthaccesstoken.php +++ b/actions/apioauthaccesstoken.php @@ -56,7 +56,7 @@ class ApiOAuthAccessTokenAction extends ApiOAuthAction { parent::handle($args); - $datastore = new ApiGNUSocialOAuthDataStore(); + $datastore = new ApiGNUsocialOAuthDataStore(); $server = new OAuthServer($datastore); $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); diff --git a/actions/apioauthauthorize.php b/actions/apioauthauthorize.php index baaea6fd9b..d0dcf9c9c7 100644 --- a/actions/apioauthauthorize.php +++ b/actions/apioauthauthorize.php @@ -68,7 +68,7 @@ class ApiOAuthAuthorizeAction extends ApiOAuthAction $this->password = $this->arg('password'); $this->oauthTokenParam = $this->arg('oauth_token'); $this->mode = $this->arg('mode'); - $this->store = new ApiGNUSocialOAuthDataStore(); + $this->store = new ApiGNUsocialOAuthDataStore(); try { $this->app = $this->store->getAppByRequestToken($this->oauthTokenParam); diff --git a/actions/apioauthrequesttoken.php b/actions/apioauthrequesttoken.php index 324c30d17f..083bbc3756 100644 --- a/actions/apioauthrequesttoken.php +++ b/actions/apioauthrequesttoken.php @@ -73,7 +73,7 @@ class ApiOAuthRequestTokenAction extends ApiOAuthAction { parent::handle($args); - $datastore = new ApiGNUSocialOAuthDataStore(); + $datastore = new ApiGNUsocialOAuthDataStore(); $server = new OAuthServer($datastore); $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); diff --git a/actions/apisearchjson.php b/actions/apisearchjson.php index 1ced471560..794f23077b 100644 --- a/actions/apisearchjson.php +++ b/actions/apisearchjson.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Search - * @package GNUSocial + * @package GNUsocial * @author Zach Copley * @copyright 2008-2010 StatusNet, Inc. * @copyright 2013 Free Software Foundation, Inc. diff --git a/actions/apistatusesfavs.php b/actions/apistatusesfavs.php index 9a60028419..a736208276 100644 --- a/actions/apistatusesfavs.php +++ b/actions/apistatusesfavs.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category API - * @package GNUSocial + * @package GNUsocial * @author Hannes Mannerheim * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://www.gnu.org/software/social/ diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php index c357cdf17e..10a22e77bc 100644 --- a/actions/avatarbynickname.php +++ b/actions/avatarbynickname.php @@ -34,7 +34,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * Retrieve user avatar by nickname action class. * * @category Action - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Robin Millette * @author Mikael Nordfeldth diff --git a/actions/disfavor.php b/actions/disfavor.php index 72b8d26f76..ef9ee1ee2b 100644 --- a/actions/disfavor.php +++ b/actions/disfavor.php @@ -5,7 +5,7 @@ * PHP version 5 * * @category Action - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Robin Millette * @author Mikael Nordfeldth @@ -35,7 +35,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * DisfavorAction class. * * @category Action - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Robin Millette * @author Mikael Nordfeldth diff --git a/actions/favor.php b/actions/favor.php index 720d80541f..1ce0eb8947 100644 --- a/actions/favor.php +++ b/actions/favor.php @@ -5,7 +5,7 @@ * PHP version 5 * * @category Action - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Robin Millette * @author Mikael Nordfeldth @@ -37,7 +37,7 @@ require_once INSTALLDIR.'/lib/mail.php'; * FavorAction class. * * @category Action - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Robin Millette * @author Mikael Nordfeldth diff --git a/actions/oauthconnectionssettings.php b/actions/oauthconnectionssettings.php index 43e6b45898..eaa0fae8da 100644 --- a/actions/oauthconnectionssettings.php +++ b/actions/oauthconnectionssettings.php @@ -168,7 +168,7 @@ class OauthconnectionssettingsAction extends SettingsAction $app = Oauth_application::getKV('id', $appUser->application_id); - $datastore = new ApiGNUSocialOAuthDataStore(); + $datastore = new ApiGNUsocialOAuthDataStore(); $datastore->revoke_token($appUser->token, 1); $result = $appUser->delete(); diff --git a/classes/Profile_prefs.php b/classes/Profile_prefs.php index 7ad6233c55..97df488b6a 100644 --- a/classes/Profile_prefs.php +++ b/classes/Profile_prefs.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Data - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2013 Free Software Foundation, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 diff --git a/extlib/README b/extlib/README index 06deb11a38..e62cb9960f 100644 --- a/extlib/README +++ b/extlib/README @@ -51,7 +51,7 @@ A: If the upstream project is moribund and there's a way to adopt it, Q: What if there's no upstream authority and it can't be adopted? A: Then we fork it. Make a new name and a new version. Include it in - lib/ instead of extlib/, and use the GNUSocial_* prefix to change + lib/ instead of extlib/, and use the GNUsocial_* prefix to change the namespace to avoid collisions. This is a last resort; consult with the rest of the dev group diff --git a/lib/apiauthaction.php b/lib/apiauthaction.php index 4fe8a6e9be..56100cd494 100644 --- a/lib/apiauthaction.php +++ b/lib/apiauthaction.php @@ -155,7 +155,7 @@ class ApiAuthAction extends ApiAction */ function checkOAuthRequest($request) { - $datastore = new ApiGNUSocialOAuthDataStore(); + $datastore = new ApiGNUsocialOAuthDataStore(); $server = new OAuthServer($datastore); $hmac_method = new OAuthSignatureMethod_HMAC_SHA1(); diff --git a/lib/apignusocialoauthdatastore.php b/lib/apignusocialoauthdatastore.php index 17b19fb1d6..d3eec55c9e 100644 --- a/lib/apignusocialoauthdatastore.php +++ b/lib/apignusocialoauthdatastore.php @@ -24,7 +24,7 @@ require_once 'OAuth.php'; /** * @fixme class doc */ -class ApiGNUSocialOAuthDataStore extends OAuthDataStore +class ApiGNUsocialOAuthDataStore extends OAuthDataStore { function lookup_consumer($consumerKey) { diff --git a/lib/disfavorform.php b/lib/disfavorform.php index 2a7e9ff9eb..d91ad1b61c 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Form - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Sarven Capadisli * @author Mikael Nordfeldth @@ -35,7 +35,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * Form for disfavoring a notice * * @category Form - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Sarven Capadisli * @author Mikael Nordfeldth diff --git a/lib/favorform.php b/lib/favorform.php index 46e19476a8..ebf1b5ffc9 100644 --- a/lib/favorform.php +++ b/lib/favorform.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Form - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Sarven Capadisli * @author Mikael Nordfeldth @@ -35,7 +35,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * Form for favoring a notice * * @category Form - * @package GNUSocial + * @package GNUsocial * @author Evan Prodromou * @author Sarven Capadisli * @author Mikael Nordfeldth diff --git a/lib/filenotfoundexception.php b/lib/filenotfoundexception.php index e7ea7bc23c..d3610249db 100644 --- a/lib/filenotfoundexception.php +++ b/lib/filenotfoundexception.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Exception - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2013 Free Software Foundation, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 diff --git a/lib/httpclient.php b/lib/httpclient.php index 0dd73e422e..a92c7d8c5b 100644 --- a/lib/httpclient.php +++ b/lib/httpclient.php @@ -54,7 +54,7 @@ require_once 'HTTP/Request2/Response.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class GNUSocial_HTTPResponse extends HTTP_Request2_Response +class GNUsocial_HTTPResponse extends HTTP_Request2_Response { function __construct(HTTP_Request2_Response $response, $url, $redirects=0) { @@ -173,7 +173,7 @@ class HTTPClient extends HTTP_Request2 /** * Convenience function to run a GET request. * - * @return GNUSocial_HTTPResponse + * @return GNUsocial_HTTPResponse * @throws HTTP_Request2_Exception */ public function get($url, $headers=array()) @@ -184,7 +184,7 @@ class HTTPClient extends HTTP_Request2 /** * Convenience function to run a HEAD request. * - * @return GNUSocial_HTTPResponse + * @return GNUsocial_HTTPResponse * @throws HTTP_Request2_Exception */ public function head($url, $headers=array()) @@ -198,7 +198,7 @@ class HTTPClient extends HTTP_Request2 * @param string $url * @param array $headers optional associative array of HTTP headers * @param array $data optional associative array or blob of form data to submit - * @return GNUSocial_HTTPResponse + * @return GNUsocial_HTTPResponse * @throws HTTP_Request2_Exception */ public function post($url, $headers=array(), $data=array()) @@ -210,7 +210,7 @@ class HTTPClient extends HTTP_Request2 } /** - * @return GNUSocial_HTTPResponse + * @return GNUsocial_HTTPResponse * @throws HTTP_Request2_Exception */ protected function doRequest($url, $method, $headers) @@ -254,11 +254,11 @@ class HTTPClient extends HTTP_Request2 /** * Actually performs the HTTP request and returns a - * GNUSocial_HTTPResponse object with response body and header info. + * GNUsocial_HTTPResponse object with response body and header info. * * Wraps around parent send() to add logging and redirection processing. * - * @return GNUSocial_HTTPResponse + * @return GNUsocial_HTTPResponse * @throw HTTP_Request2_Exception */ public function send() @@ -301,6 +301,6 @@ class HTTPClient extends HTTP_Request2 } break; } while ($maxRedirs); - return new GNUSocial_HTTPResponse($response, $this->getUrl(), $redirs); + return new GNUsocial_HTTPResponse($response, $this->getUrl(), $redirs); } } diff --git a/lib/invalidurlexception.php b/lib/invalidurlexception.php index 531b79698a..fe934bfc8c 100644 --- a/lib/invalidurlexception.php +++ b/lib/invalidurlexception.php @@ -33,7 +33,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } * Class for an exception when a URL is invalid * * @category Exception - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 * @link http://status.net/ diff --git a/lib/noavatarexception.php b/lib/noavatarexception.php index ac411579c5..ab2b0e8be9 100644 --- a/lib/noavatarexception.php +++ b/lib/noavatarexception.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Exception - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2013 Free Software Foundation, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 diff --git a/lib/noresultexception.php b/lib/noresultexception.php index b664dab5e7..fb1cdae039 100644 --- a/lib/noresultexception.php +++ b/lib/noresultexception.php @@ -20,7 +20,7 @@ * along with this program. If not, see . * * @category Exception - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2013 Free Software Foundation, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3 diff --git a/plugins/GNUsocialPhotos/actions/photos.php b/plugins/GNUsocialPhotos/actions/photos.php index c966d0b71d..b1e1b73ff1 100644 --- a/plugins/GNUsocialPhotos/actions/photos.php +++ b/plugins/GNUsocialPhotos/actions/photos.php @@ -120,7 +120,7 @@ class PhotosAction extends Action function showAlbum($album_id) { - $album = GNUSocialPhotoAlbum::getKV('album_id', $album_id); + $album = GNUsocialPhotoAlbum::getKV('album_id', $album_id); if (!$album) { return; } diff --git a/plugins/LRDD/LRDDPlugin.php b/plugins/LRDD/LRDDPlugin.php index afe119c648..23a10322dc 100644 --- a/plugins/LRDD/LRDDPlugin.php +++ b/plugins/LRDD/LRDDPlugin.php @@ -21,7 +21,7 @@ * Implements Link-based Resource Descriptor Discovery based on RFC6415, * Web Host Metadata, i.e. the predecessor to WebFinger resource discovery. * - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth */ diff --git a/plugins/LRDD/lib/discovery.php b/plugins/LRDD/lib/discovery.php index f9b8d2930f..423237bb25 100644 --- a/plugins/LRDD/lib/discovery.php +++ b/plugins/LRDD/lib/discovery.php @@ -23,7 +23,7 @@ * along with this program. If not, see . * * @category Discovery - * @package GNUSocial + * @package GNUsocial * @author James Walker * @author Mikael Nordfeldth * @copyright 2010 StatusNet, Inc. diff --git a/plugins/LRDD/lib/lrddmethod/webfinger.php b/plugins/LRDD/lib/lrddmethod/webfinger.php index a38e025f23..1712abec13 100644 --- a/plugins/LRDD/lib/lrddmethod/webfinger.php +++ b/plugins/LRDD/lib/lrddmethod/webfinger.php @@ -3,7 +3,7 @@ * Implementation of WebFinger resource discovery (RFC7033) * * @category Discovery - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2013 Free Software Foundation, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php index 3c7231a090..8efce27d35 100644 --- a/plugins/WebFinger/WebFingerPlugin.php +++ b/plugins/WebFinger/WebFingerPlugin.php @@ -23,7 +23,7 @@ * * Depends on: LRDD plugin * - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth */ diff --git a/plugins/WebFinger/lib/webfinger.php b/plugins/WebFinger/lib/webfinger.php index bd758917fd..2acb430e8b 100644 --- a/plugins/WebFinger/lib/webfinger.php +++ b/plugins/WebFinger/lib/webfinger.php @@ -20,7 +20,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . * - * @package GNUSocial + * @package GNUsocial * @author Mikael Nordfeldth * @copyright 2013 Free Software Foundation, Inc. * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0