From 2ab2e22a36a0218abbe2e0106a0b9048cbeab0be Mon Sep 17 00:00:00 2001 From: Miguel Dantas Date: Thu, 22 Aug 2019 18:06:14 +0100 Subject: [PATCH] [LIB_REFACTOR] Moving files into separate semantic categories --- actions/featured.php | 4 ++-- actions/groupqueue.php | 4 ++-- actions/groups.php | 2 +- actions/noticesearch.php | 2 +- actions/nudge.php | 2 +- actions/peoplesearch.php | 4 ++-- actions/peopletag.php | 2 +- actions/peopletagged.php | 2 +- actions/peopletagsbyuser.php | 2 +- actions/peopletagsforuser.php | 2 +- actions/peopletagsubscribers.php | 2 +- actions/peopletagsubscriptions.php | 2 +- actions/shownotice.php | 2 +- actions/usergroups.php | 2 +- classes/Memcached_DataObject.php | 2 +- classes/Notice.php | 2 +- lib/{ => action}/action.php | 0 lib/{ => action}/erroraction.php | 0 lib/{ => action}/servererroraction.php | 0 lib/{ => activitystreams}/activity.php | 0 lib/{ => activitystreams}/activitycontext.php | 0 lib/{ => activitystreams}/activityimporter.php | 0 lib/{ => activitystreams}/activitymover.php | 0 lib/{ => activitystreams}/activityobject.php | 0 lib/{ => activitystreams}/activitystreamjsondocument.php | 0 lib/{ => activitystreams}/activitystreamslink.php | 0 lib/{ => activitystreams}/activitystreamsmedialink.php | 0 lib/{ => activitystreams}/activityutils.php | 0 lib/{ => activitystreams}/activityverb.php | 0 lib/{ => activitystreams}/jsonactivitycollection.php | 0 lib/{ => activitystreams}/useractivitystream.php | 2 +- lib/{ => admin}/adminform.php | 0 lib/{ => admin}/adminpanelaction.php | 0 lib/{ => admin}/adminpanelnav.php | 0 lib/{ => admin}/deletegroupform.php | 0 lib/{ => admin}/deleteuserform.php | 0 lib/{ => admin}/deluserqueuehandler.php | 0 lib/{ => admin}/grantroleform.php | 0 lib/{ => admin}/plugindeleteform.php | 0 lib/{ => admin}/plugindisableform.php | 0 lib/{ => admin}/pluginenableform.php | 0 lib/{ => admin}/pluginlist.php | 0 lib/{ => admin}/revokeroleform.php | 0 lib/{ => admin}/sandboxform.php | 0 lib/{ => admin}/silenceform.php | 0 lib/{ => admin}/unsandboxform.php | 0 lib/{ => admin}/unsilenceform.php | 0 lib/{ => api}/apiaction.php | 0 lib/{ => api}/apiauthaction.php | 0 lib/{ => api}/apibareauthaction.php | 0 lib/{ => api}/apignusocialoauthdatastore.php | 0 lib/{ => api}/apilistusers.php | 0 lib/{ => api}/apioauthaction.php | 0 lib/{ => api}/apiprivateauthaction.php | 0 lib/{ => application}/applicationeditform.php | 0 lib/{ => application}/applicationlist.php | 0 lib/{ => application}/connectedappslist.php | 0 lib/{ => cache}/cache.php | 0 lib/{ => database/db}/columndef.php | 0 lib/{ => database}/dberroraction.php | 2 +- lib/{ => database}/mysqlschema.php | 0 lib/{ => database}/pgsqlschema.php | 0 lib/{ => database}/schema.php | 0 lib/{ => database}/schemaupdater.php | 0 lib/{ => database}/tabledef.php | 0 lib/{ => exceptions}/alreadyfulfilledexception.php | 0 lib/{ => exceptions}/authorizationexception.php | 0 lib/{ => exceptions}/clientexception.php | 0 lib/{ => exceptions}/configexception.php | 0 lib/{ => exceptions}/emailexception.php | 0 lib/{ => exceptions}/emptypkeyvalueexception.php | 0 lib/{ => exceptions}/filenotfoundexception.php | 0 lib/{ => exceptions}/filenotstoredlocallyexception.php | 0 lib/{ => exceptions}/groupnoprofileexception.php | 0 lib/{ => exceptions}/invalidfilenameexception.php | 0 lib/{ => exceptions}/invalidurlexception.php | 0 lib/{ => exceptions}/methodnotimplementedexception.php | 0 lib/{ => exceptions}/noavatarexception.php | 0 lib/{ => exceptions}/nohttpresponseexception.php | 0 lib/{ => exceptions}/noobjecttypeexception.php | 0 lib/{ => exceptions}/noparentnoticeexception.php | 0 lib/{ => exceptions}/noprofileexception.php | 0 lib/{ => exceptions}/noqueuehandlerexception.php | 0 lib/{ => exceptions}/noresultexception.php | 0 lib/{ => exceptions}/noroutemapexception.php | 0 lib/{ => exceptions}/nosuchgroupexception.php | 0 lib/{ => exceptions}/nosuchuserexception.php | 0 lib/{ => exceptions}/nouploadedmediaexception.php | 0 lib/{ => exceptions}/nouriexception.php | 0 lib/{ => exceptions}/passwordhashexception.php | 0 lib/{ => exceptions}/privatestreamexception.php | 0 lib/{ => exceptions}/profilenoaccturiexception.php | 0 lib/{ => exceptions}/serverexception.php | 0 lib/{ => exceptions}/unknownextensionmimeexception.php | 0 lib/{ => exceptions}/unknownmimeextensionexception.php | 0 lib/{ => exceptions}/unknownuriexception.php | 0 lib/{ => exceptions}/unsupportedmediaexception.php | 0 lib/{ => exceptions}/usefileasthumbnailexception.php | 0 lib/{ => exceptions}/usernoprofileexception.php | 0 lib/{ => feeds}/activitysink.php | 0 lib/{ => feeds}/activitysource.php | 0 lib/{ => feeds}/atom10feed.php | 0 lib/{ => feeds}/atomcategory.php | 0 lib/{ => feeds}/atomgroupnoticefeed.php | 0 lib/{ => feeds}/atomlistnoticefeed.php | 0 lib/{ => feeds}/atomnoticefeed.php | 0 lib/{ => feeds}/atompubaction.php | 0 lib/{ => feeds}/atompubclient.php | 0 lib/{ => feeds}/atomusernoticefeed.php | 0 lib/{ => feeds}/feed.php | 0 lib/{ => feeds}/feedimporter.php | 0 lib/{ => feeds}/feedlist.php | 0 lib/{ => feeds}/rss10action.php | 0 lib/{ => feeds}/targetedrss10action.php | 0 lib/{ => groups}/approvegroupform.php | 2 +- lib/{ => groups}/cancelgroupform.php | 0 lib/{ => groups}/groupaction.php | 0 lib/{ => groups}/groupadminsection.php | 0 lib/{ => groups}/groupblockedminilist.php | 0 lib/{ => groups}/groupblockedminilistitem.php | 0 lib/{ => groups}/groupblockform.php | 0 lib/{ => groups}/groupeditform.php | 2 +- lib/{ => groups}/grouplist.php | 2 +- lib/{ => groups}/groupmemberlist.php | 0 lib/{ => groups}/groupmemberlistitem.php | 0 lib/{ => groups}/groupmembersminilist.php | 0 lib/{ => groups}/groupmembersminilistitem.php | 0 lib/{ => groups}/groupminilist.php | 2 +- lib/{ => groups}/groupnoticestream.php | 0 lib/{ => groups}/groupprofileblock.php | 0 lib/{ => groups}/groupsbymemberssection.php | 0 lib/{ => groups}/groupsbypostssection.php | 0 lib/{ => groups}/groupsection.php | 0 lib/{ => groups}/groupsnav.php | 0 lib/{ => groups}/joinform.php | 0 lib/{ => groups}/leaveform.php | 0 lib/{ => groups}/makeadminform.php | 0 lib/{ => groups}/publicgroupnav.php | 0 lib/{ => groups}/threadinggroupnoticestream.php | 0 lib/{ => im}/imchannel.php | 0 lib/{ => im}/immanager.php | 0 lib/{ => im}/imqueuehandler.php | 0 lib/{ => im}/imreceiverqueuehandler.php | 0 lib/{ => im}/imsenderqueuehandler.php | 0 lib/{ => media}/attachment.php | 0 lib/{ => media}/attachmentlist.php | 0 lib/{ => media}/attachmentlistitem.php | 0 lib/{ => media}/attachmentnoticesection.php | 0 lib/{ => media}/imagefile.php | 0 lib/{ => media}/inlineattachmentlist.php | 0 lib/{ => media}/inlineattachmentlistitem.php | 0 lib/{ => media}/mediafile.php | 0 lib/{ => notices}/cachingnoticestream.php | 0 lib/{ => notices}/conversationnoticestream.php | 0 lib/{ => notices}/distribqueuehandler.php | 0 lib/{ => notices}/dofollowlistitem.php | 2 +- lib/{ => notices}/filenoticestream.php | 0 lib/{ => notices}/filteringnoticestream.php | 0 lib/{ => notices}/fullnoticestream.php | 0 lib/{ => notices}/fullthreadednoticelist.php | 0 lib/{ => notices}/inboxnoticestream.php | 0 lib/{ => notices}/jsonsearchresultslist.php | 0 lib/{ => notices}/listsnav.php | 0 lib/{ => notices}/moderatednoticestream.php | 0 lib/{ => notices}/networkpublicnoticestream.php | 0 lib/{ => notices}/noticeform.php | 0 lib/{ => notices}/noticelist.php | 0 lib/{ => notices}/noticelistactorsitem.php | 0 lib/{ => notices}/noticelistitem.php | 0 lib/{ => notices}/noticelistitemadapter.php | 0 lib/{ => notices}/noticesaveexception.php | 0 lib/{ => notices}/noticesection.php | 0 lib/{ => notices}/noticestream.php | 0 lib/{ => notices}/noticestreamaction.php | 0 lib/{ => notices}/primarynoticelist.php | 0 lib/{ => notices}/publicnoticestream.php | 0 lib/{ => notices}/replynoticestream.php | 0 lib/{ => notices}/scopingnoticestream.php | 0 lib/{ => notices}/sitestreamaction.php | 0 lib/{ => notices}/taggedprofilenoticestream.php | 0 lib/{ => notices}/tagnoticestream.php | 0 lib/{ => notices}/threadednoticelist.php | 0 lib/{ => notices}/threadednoticelistitem.php | 0 lib/{ => notices}/threadednoticelistmoreitem.php | 0 lib/{ => notices}/threadednoticelistsubitem.php | 0 lib/{ => notices}/threadingnetworkpublicnoticestream.php | 0 lib/{ => notices}/threadingnoticestream.php | 0 lib/{ => notices}/threadingpublicnoticestream.php | 0 lib/{ => portablecontacts}/poco.php | 0 lib/{ => portablecontacts}/pocoaddress.php | 0 lib/{ => portablecontacts}/pocourl.php | 0 lib/{ => profile}/accountmover.php | 0 lib/{ => profile}/accountprofileblock.php | 0 lib/{ => profile}/approvesubform.php | 0 lib/{ => profile}/avatarlink.php | 0 lib/{ => profile}/backupaccountform.php | 0 lib/{ => profile}/blockform.php | 0 lib/{ => profile}/cancelsubscriptionform.php | 4 ++-- lib/{ => profile}/defaultprofileblock.php | 0 lib/{ => profile}/logingroupnav.php | 2 +- lib/{ => profile}/nickname.php | 0 lib/{ => profile}/nudgeform.php | 2 +- lib/{ => profile}/peopletag.php | 0 lib/{ => profile}/peopletageditform.php | 4 ++-- lib/{ => profile}/peopletaggroupnav.php | 2 +- lib/{ => profile}/peopletaglist.php | 0 lib/{ => profile}/peopletaglistitem.php | 0 lib/{ => profile}/peopletagnav.php | 2 +- lib/{ => profile}/peopletagnoticestream.php | 0 lib/{ => profile}/peopletagsbysubssection.php | 0 lib/{ => profile}/peopletagsection.php | 0 lib/{ => profile}/peopletagsforusersection.php | 0 lib/{ => profile}/peopletagsubscriptionssection.php | 0 lib/{ => profile}/peopletagswidget.php | 0 lib/{ => profile}/personalgroupnav.php | 0 lib/{ => profile}/profileaction.php | 0 lib/{ => profile}/profileactionform.php | 0 lib/{ => profile}/profileblock.php | 0 lib/{ => profile}/profileformaction.php | 0 lib/{ => profile}/profilelist.php | 0 lib/{ => profile}/profilelistitem.php | 0 lib/{ => profile}/profileminilist.php | 0 lib/{ => profile}/profileminilistitem.php | 0 lib/{ => profile}/profilenoticestream.php | 0 lib/{ => profile}/profilesection.php | 0 lib/{ => profile}/subqueuelist.php | 0 lib/{ => profile}/subqueuelistitem.php | 0 lib/{ => profile}/subscribeform.php | 2 +- lib/{ => profile}/subscribepeopletagform.php | 2 +- lib/{ => profile}/subscriberslist.php | 0 lib/{ => profile}/subscriberslistitem.php | 0 lib/{ => profile}/subscribersminilist.php | 0 lib/{ => profile}/subscribersminilistitem.php | 0 lib/{ => profile}/subscriptionlist.php | 0 lib/{ => profile}/subscriptionlistitem.php | 0 lib/{ => profile}/subscriptionslist.php | 0 lib/{ => profile}/subscriptionslistitem.php | 0 lib/{ => profile}/tagprofileform.php | 0 lib/{ => profile}/togglepeopletag.php | 2 +- lib/{ => profile}/unblockform.php | 0 lib/{ => profile}/unsubscribeform.php | 2 +- lib/{ => profile}/unsubscribepeopletagform.php | 2 +- lib/{ => queue}/dbqueuemanager.php | 0 lib/{ => queue}/liberalstomp.php | 0 lib/{ => queue}/pingqueuehandler.php | 0 lib/{ => queue}/pluginqueuehandler.php | 0 lib/{ => queue}/queuehandler.php | 0 lib/{ => queue}/queuemanager.php | 0 lib/{ => queue}/queuemonitor.php | 0 lib/{ => queue}/smsqueuehandler.php | 2 +- lib/{ => queue}/stompqueuemanager.php | 0 lib/{ => queue}/unqueuemanager.php | 0 lib/{ => search}/search_engines.php | 0 lib/{ => search}/searchaction.php | 2 +- lib/{ => search}/searchform.php | 0 lib/{ => search}/searchgroupnav.php | 0 lib/{ => search}/searchnoticestream.php | 0 lib/{ => ui}/channel.php | 0 lib/{ => ui}/clienterroraction.php | 0 lib/{ => ui}/defaultlocalnav.php | 0 lib/{ => ui}/featureduserssection.php | 0 lib/{ => ui}/galleryaction.php | 0 lib/{ => ui}/homestubnav.php | 0 lib/{ => ui}/invitebuttonsection.php | 0 lib/{ => ui}/inviteform.php | 0 lib/{ => ui}/menu.php | 0 lib/{ => ui}/moremenu.php | 0 lib/{ => ui}/primarynav.php | 0 lib/{ => ui}/secondarynav.php | 0 lib/{ => ui}/section.php | 0 lib/{ => ui}/sectionnoticelist.php | 0 lib/{ => ui}/selftagswidget.php | 0 lib/{ => ui}/settingsaction.php | 0 lib/{ => ui}/settingsnav.php | 0 lib/{ => ui}/siteprofile.php | 0 lib/{ => ui}/subgroupnav.php | 2 +- lib/{ => ui}/theme.php | 0 lib/{ => ui}/topposterssection.php | 0 lib/{ => ui}/toselector.php | 0 lib/{ => ui}/widget.php | 0 lib/{ => util}/arraywrapper.php | 0 lib/{ => util}/callableleftcurry.php | 0 lib/{ => util}/command.php | 2 +- lib/{ => util}/commandinterpreter.php | 2 +- lib/{ => util}/common.php | 0 lib/{ => util}/daemon.php | 0 lib/{ => util}/default.php | 0 lib/{ => util}/deletetree.php | 0 lib/{ => util}/docfile.php | 0 lib/{ => util}/event.php | 0 lib/{ => util}/form.php | 2 +- lib/{ => util}/formaction.php | 0 lib/{ => util}/framework.php | 0 lib/{ => util}/gnusocial.php | 0 lib/{ => util}/htmloutputter.php | 0 lib/{ => util}/httpclient.php | 0 lib/{ => util}/infoaction.php | 0 lib/{ => util}/installer.php | 0 lib/{ => util}/internalsessionhandler.php | 0 lib/{ => util}/iomanager.php | 0 lib/{ => util}/iomaster.php | 0 lib/{ => util}/language.php | 0 lib/{ => util}/location.php | 0 lib/{ => util}/mail.php | 0 lib/{ => util}/mailhandler.php | 0 lib/{ => util}/managedaction.php | 0 lib/{ => util}/oauthclient.php | 0 lib/{ => util}/parallelizingdaemon.php | 0 lib/{ => util}/ping.php | 0 lib/{ => util}/processmanager.php | 0 lib/{ => util}/redirectingaction.php | 0 lib/{ => util}/right.php | 0 lib/{ => util}/router.php | 0 lib/{ => util}/spawningdaemon.php | 0 lib/{ => util}/taguri.php | 0 lib/{ => util}/themeuploader.php | 0 lib/{ => util}/urlmapper.php | 0 lib/{ => util}/util.php | 0 lib/{ => util}/uuid.php | 0 lib/{ => util}/webcolor.php | 0 lib/{ => util}/xmloutputter.php | 0 lib/{ => util}/xmlstringer.php | 0 modules/Favorite/FavoriteModule.php | 2 +- plugins/AnonymousFave/forms/anondisfavor.php | 2 +- plugins/AnonymousFave/forms/anonfavor.php | 2 +- plugins/UserFlag/forms/clearflag.php | 2 +- plugins/UserFlag/forms/flagprofile.php | 2 +- scripts/maildaemon.php | 2 +- scripts/queuedaemon.php | 2 +- 329 files changed, 52 insertions(+), 52 deletions(-) rename lib/{ => action}/action.php (100%) rename lib/{ => action}/erroraction.php (100%) rename lib/{ => action}/servererroraction.php (100%) rename lib/{ => activitystreams}/activity.php (100%) rename lib/{ => activitystreams}/activitycontext.php (100%) rename lib/{ => activitystreams}/activityimporter.php (100%) rename lib/{ => activitystreams}/activitymover.php (100%) rename lib/{ => activitystreams}/activityobject.php (100%) rename lib/{ => activitystreams}/activitystreamjsondocument.php (100%) rename lib/{ => activitystreams}/activitystreamslink.php (100%) rename lib/{ => activitystreams}/activitystreamsmedialink.php (100%) rename lib/{ => activitystreams}/activityutils.php (100%) rename lib/{ => activitystreams}/activityverb.php (100%) rename lib/{ => activitystreams}/jsonactivitycollection.php (100%) rename lib/{ => activitystreams}/useractivitystream.php (99%) rename lib/{ => admin}/adminform.php (100%) rename lib/{ => admin}/adminpanelaction.php (100%) rename lib/{ => admin}/adminpanelnav.php (100%) rename lib/{ => admin}/deletegroupform.php (100%) rename lib/{ => admin}/deleteuserform.php (100%) rename lib/{ => admin}/deluserqueuehandler.php (100%) rename lib/{ => admin}/grantroleform.php (100%) rename lib/{ => admin}/plugindeleteform.php (100%) rename lib/{ => admin}/plugindisableform.php (100%) rename lib/{ => admin}/pluginenableform.php (100%) rename lib/{ => admin}/pluginlist.php (100%) rename lib/{ => admin}/revokeroleform.php (100%) rename lib/{ => admin}/sandboxform.php (100%) rename lib/{ => admin}/silenceform.php (100%) rename lib/{ => admin}/unsandboxform.php (100%) rename lib/{ => admin}/unsilenceform.php (100%) rename lib/{ => api}/apiaction.php (100%) rename lib/{ => api}/apiauthaction.php (100%) rename lib/{ => api}/apibareauthaction.php (100%) rename lib/{ => api}/apignusocialoauthdatastore.php (100%) rename lib/{ => api}/apilistusers.php (100%) rename lib/{ => api}/apioauthaction.php (100%) rename lib/{ => api}/apiprivateauthaction.php (100%) rename lib/{ => application}/applicationeditform.php (100%) rename lib/{ => application}/applicationlist.php (100%) rename lib/{ => application}/connectedappslist.php (100%) rename lib/{ => cache}/cache.php (100%) rename lib/{ => database/db}/columndef.php (100%) rename lib/{ => database}/dberroraction.php (97%) rename lib/{ => database}/mysqlschema.php (100%) rename lib/{ => database}/pgsqlschema.php (100%) rename lib/{ => database}/schema.php (100%) rename lib/{ => database}/schemaupdater.php (100%) rename lib/{ => database}/tabledef.php (100%) rename lib/{ => exceptions}/alreadyfulfilledexception.php (100%) rename lib/{ => exceptions}/authorizationexception.php (100%) rename lib/{ => exceptions}/clientexception.php (100%) rename lib/{ => exceptions}/configexception.php (100%) rename lib/{ => exceptions}/emailexception.php (100%) rename lib/{ => exceptions}/emptypkeyvalueexception.php (100%) rename lib/{ => exceptions}/filenotfoundexception.php (100%) rename lib/{ => exceptions}/filenotstoredlocallyexception.php (100%) rename lib/{ => exceptions}/groupnoprofileexception.php (100%) rename lib/{ => exceptions}/invalidfilenameexception.php (100%) rename lib/{ => exceptions}/invalidurlexception.php (100%) rename lib/{ => exceptions}/methodnotimplementedexception.php (100%) rename lib/{ => exceptions}/noavatarexception.php (100%) rename lib/{ => exceptions}/nohttpresponseexception.php (100%) rename lib/{ => exceptions}/noobjecttypeexception.php (100%) rename lib/{ => exceptions}/noparentnoticeexception.php (100%) rename lib/{ => exceptions}/noprofileexception.php (100%) rename lib/{ => exceptions}/noqueuehandlerexception.php (100%) rename lib/{ => exceptions}/noresultexception.php (100%) rename lib/{ => exceptions}/noroutemapexception.php (100%) rename lib/{ => exceptions}/nosuchgroupexception.php (100%) rename lib/{ => exceptions}/nosuchuserexception.php (100%) rename lib/{ => exceptions}/nouploadedmediaexception.php (100%) rename lib/{ => exceptions}/nouriexception.php (100%) rename lib/{ => exceptions}/passwordhashexception.php (100%) rename lib/{ => exceptions}/privatestreamexception.php (100%) rename lib/{ => exceptions}/profilenoaccturiexception.php (100%) rename lib/{ => exceptions}/serverexception.php (100%) rename lib/{ => exceptions}/unknownextensionmimeexception.php (100%) rename lib/{ => exceptions}/unknownmimeextensionexception.php (100%) rename lib/{ => exceptions}/unknownuriexception.php (100%) rename lib/{ => exceptions}/unsupportedmediaexception.php (100%) rename lib/{ => exceptions}/usefileasthumbnailexception.php (100%) rename lib/{ => exceptions}/usernoprofileexception.php (100%) rename lib/{ => feeds}/activitysink.php (100%) rename lib/{ => feeds}/activitysource.php (100%) rename lib/{ => feeds}/atom10feed.php (100%) rename lib/{ => feeds}/atomcategory.php (100%) rename lib/{ => feeds}/atomgroupnoticefeed.php (100%) rename lib/{ => feeds}/atomlistnoticefeed.php (100%) rename lib/{ => feeds}/atomnoticefeed.php (100%) rename lib/{ => feeds}/atompubaction.php (100%) rename lib/{ => feeds}/atompubclient.php (100%) rename lib/{ => feeds}/atomusernoticefeed.php (100%) rename lib/{ => feeds}/feed.php (100%) rename lib/{ => feeds}/feedimporter.php (100%) rename lib/{ => feeds}/feedlist.php (100%) rename lib/{ => feeds}/rss10action.php (100%) rename lib/{ => feeds}/targetedrss10action.php (100%) rename lib/{ => groups}/approvegroupform.php (98%) rename lib/{ => groups}/cancelgroupform.php (100%) rename lib/{ => groups}/groupaction.php (100%) rename lib/{ => groups}/groupadminsection.php (100%) rename lib/{ => groups}/groupblockedminilist.php (100%) rename lib/{ => groups}/groupblockedminilistitem.php (100%) rename lib/{ => groups}/groupblockform.php (100%) rename lib/{ => groups}/groupeditform.php (99%) rename lib/{ => groups}/grouplist.php (99%) rename lib/{ => groups}/groupmemberlist.php (100%) rename lib/{ => groups}/groupmemberlistitem.php (100%) rename lib/{ => groups}/groupmembersminilist.php (100%) rename lib/{ => groups}/groupmembersminilistitem.php (100%) rename lib/{ => groups}/groupminilist.php (98%) rename lib/{ => groups}/groupnoticestream.php (100%) rename lib/{ => groups}/groupprofileblock.php (100%) rename lib/{ => groups}/groupsbymemberssection.php (100%) rename lib/{ => groups}/groupsbypostssection.php (100%) rename lib/{ => groups}/groupsection.php (100%) rename lib/{ => groups}/groupsnav.php (100%) rename lib/{ => groups}/joinform.php (100%) rename lib/{ => groups}/leaveform.php (100%) rename lib/{ => groups}/makeadminform.php (100%) rename lib/{ => groups}/publicgroupnav.php (100%) rename lib/{ => groups}/threadinggroupnoticestream.php (100%) rename lib/{ => im}/imchannel.php (100%) rename lib/{ => im}/immanager.php (100%) rename lib/{ => im}/imqueuehandler.php (100%) rename lib/{ => im}/imreceiverqueuehandler.php (100%) rename lib/{ => im}/imsenderqueuehandler.php (100%) rename lib/{ => media}/attachment.php (100%) rename lib/{ => media}/attachmentlist.php (100%) rename lib/{ => media}/attachmentlistitem.php (100%) rename lib/{ => media}/attachmentnoticesection.php (100%) rename lib/{ => media}/imagefile.php (100%) rename lib/{ => media}/inlineattachmentlist.php (100%) rename lib/{ => media}/inlineattachmentlistitem.php (100%) rename lib/{ => media}/mediafile.php (100%) rename lib/{ => notices}/cachingnoticestream.php (100%) rename lib/{ => notices}/conversationnoticestream.php (100%) rename lib/{ => notices}/distribqueuehandler.php (100%) rename lib/{ => notices}/dofollowlistitem.php (98%) rename lib/{ => notices}/filenoticestream.php (100%) rename lib/{ => notices}/filteringnoticestream.php (100%) rename lib/{ => notices}/fullnoticestream.php (100%) rename lib/{ => notices}/fullthreadednoticelist.php (100%) rename lib/{ => notices}/inboxnoticestream.php (100%) rename lib/{ => notices}/jsonsearchresultslist.php (100%) rename lib/{ => notices}/listsnav.php (100%) rename lib/{ => notices}/moderatednoticestream.php (100%) rename lib/{ => notices}/networkpublicnoticestream.php (100%) rename lib/{ => notices}/noticeform.php (100%) rename lib/{ => notices}/noticelist.php (100%) rename lib/{ => notices}/noticelistactorsitem.php (100%) rename lib/{ => notices}/noticelistitem.php (100%) rename lib/{ => notices}/noticelistitemadapter.php (100%) rename lib/{ => notices}/noticesaveexception.php (100%) rename lib/{ => notices}/noticesection.php (100%) rename lib/{ => notices}/noticestream.php (100%) rename lib/{ => notices}/noticestreamaction.php (100%) rename lib/{ => notices}/primarynoticelist.php (100%) rename lib/{ => notices}/publicnoticestream.php (100%) rename lib/{ => notices}/replynoticestream.php (100%) rename lib/{ => notices}/scopingnoticestream.php (100%) rename lib/{ => notices}/sitestreamaction.php (100%) rename lib/{ => notices}/taggedprofilenoticestream.php (100%) rename lib/{ => notices}/tagnoticestream.php (100%) rename lib/{ => notices}/threadednoticelist.php (100%) rename lib/{ => notices}/threadednoticelistitem.php (100%) rename lib/{ => notices}/threadednoticelistmoreitem.php (100%) rename lib/{ => notices}/threadednoticelistsubitem.php (100%) rename lib/{ => notices}/threadingnetworkpublicnoticestream.php (100%) rename lib/{ => notices}/threadingnoticestream.php (100%) rename lib/{ => notices}/threadingpublicnoticestream.php (100%) rename lib/{ => portablecontacts}/poco.php (100%) rename lib/{ => portablecontacts}/pocoaddress.php (100%) rename lib/{ => portablecontacts}/pocourl.php (100%) rename lib/{ => profile}/accountmover.php (100%) rename lib/{ => profile}/accountprofileblock.php (100%) rename lib/{ => profile}/approvesubform.php (100%) rename lib/{ => profile}/avatarlink.php (100%) rename lib/{ => profile}/backupaccountform.php (100%) rename lib/{ => profile}/blockform.php (100%) rename lib/{ => profile}/cancelsubscriptionform.php (97%) rename lib/{ => profile}/defaultprofileblock.php (100%) rename lib/{ => profile}/logingroupnav.php (98%) rename lib/{ => profile}/nickname.php (100%) rename lib/{ => profile}/nudgeform.php (98%) rename lib/{ => profile}/peopletag.php (100%) rename lib/{ => profile}/peopletageditform.php (98%) rename lib/{ => profile}/peopletaggroupnav.php (99%) rename lib/{ => profile}/peopletaglist.php (100%) rename lib/{ => profile}/peopletaglistitem.php (100%) rename lib/{ => profile}/peopletagnav.php (99%) rename lib/{ => profile}/peopletagnoticestream.php (100%) rename lib/{ => profile}/peopletagsbysubssection.php (100%) rename lib/{ => profile}/peopletagsection.php (100%) rename lib/{ => profile}/peopletagsforusersection.php (100%) rename lib/{ => profile}/peopletagsubscriptionssection.php (100%) rename lib/{ => profile}/peopletagswidget.php (100%) rename lib/{ => profile}/personalgroupnav.php (100%) rename lib/{ => profile}/profileaction.php (100%) rename lib/{ => profile}/profileactionform.php (100%) rename lib/{ => profile}/profileblock.php (100%) rename lib/{ => profile}/profileformaction.php (100%) rename lib/{ => profile}/profilelist.php (100%) rename lib/{ => profile}/profilelistitem.php (100%) rename lib/{ => profile}/profileminilist.php (100%) rename lib/{ => profile}/profileminilistitem.php (100%) rename lib/{ => profile}/profilenoticestream.php (100%) rename lib/{ => profile}/profilesection.php (100%) rename lib/{ => profile}/subqueuelist.php (100%) rename lib/{ => profile}/subqueuelistitem.php (100%) rename lib/{ => profile}/subscribeform.php (98%) rename lib/{ => profile}/subscribepeopletagform.php (98%) rename lib/{ => profile}/subscriberslist.php (100%) rename lib/{ => profile}/subscriberslistitem.php (100%) rename lib/{ => profile}/subscribersminilist.php (100%) rename lib/{ => profile}/subscribersminilistitem.php (100%) rename lib/{ => profile}/subscriptionlist.php (100%) rename lib/{ => profile}/subscriptionlistitem.php (100%) rename lib/{ => profile}/subscriptionslist.php (100%) rename lib/{ => profile}/subscriptionslistitem.php (100%) rename lib/{ => profile}/tagprofileform.php (100%) rename lib/{ => profile}/togglepeopletag.php (99%) rename lib/{ => profile}/unblockform.php (100%) rename lib/{ => profile}/unsubscribeform.php (98%) rename lib/{ => profile}/unsubscribepeopletagform.php (98%) rename lib/{ => queue}/dbqueuemanager.php (100%) rename lib/{ => queue}/liberalstomp.php (100%) rename lib/{ => queue}/pingqueuehandler.php (100%) rename lib/{ => queue}/pluginqueuehandler.php (100%) rename lib/{ => queue}/queuehandler.php (100%) rename lib/{ => queue}/queuemanager.php (100%) rename lib/{ => queue}/queuemonitor.php (100%) rename lib/{ => queue}/smsqueuehandler.php (96%) rename lib/{ => queue}/stompqueuemanager.php (100%) rename lib/{ => queue}/unqueuemanager.php (100%) rename lib/{ => search}/search_engines.php (100%) rename lib/{ => search}/searchaction.php (98%) rename lib/{ => search}/searchform.php (100%) rename lib/{ => search}/searchgroupnav.php (100%) rename lib/{ => search}/searchnoticestream.php (100%) rename lib/{ => ui}/channel.php (100%) rename lib/{ => ui}/clienterroraction.php (100%) rename lib/{ => ui}/defaultlocalnav.php (100%) rename lib/{ => ui}/featureduserssection.php (100%) rename lib/{ => ui}/galleryaction.php (100%) rename lib/{ => ui}/homestubnav.php (100%) rename lib/{ => ui}/invitebuttonsection.php (100%) rename lib/{ => ui}/inviteform.php (100%) rename lib/{ => ui}/menu.php (100%) rename lib/{ => ui}/moremenu.php (100%) rename lib/{ => ui}/primarynav.php (100%) rename lib/{ => ui}/secondarynav.php (100%) rename lib/{ => ui}/section.php (100%) rename lib/{ => ui}/sectionnoticelist.php (100%) rename lib/{ => ui}/selftagswidget.php (100%) rename lib/{ => ui}/settingsaction.php (100%) rename lib/{ => ui}/settingsnav.php (100%) rename lib/{ => ui}/siteprofile.php (100%) rename lib/{ => ui}/subgroupnav.php (99%) rename lib/{ => ui}/theme.php (100%) rename lib/{ => ui}/topposterssection.php (100%) rename lib/{ => ui}/toselector.php (100%) rename lib/{ => ui}/widget.php (100%) rename lib/{ => util}/arraywrapper.php (100%) rename lib/{ => util}/callableleftcurry.php (100%) rename lib/{ => util}/command.php (99%) rename lib/{ => util}/commandinterpreter.php (99%) rename lib/{ => util}/common.php (100%) rename lib/{ => util}/daemon.php (100%) rename lib/{ => util}/default.php (100%) rename lib/{ => util}/deletetree.php (100%) rename lib/{ => util}/docfile.php (100%) rename lib/{ => util}/event.php (100%) rename lib/{ => util}/form.php (99%) rename lib/{ => util}/formaction.php (100%) rename lib/{ => util}/framework.php (100%) rename lib/{ => util}/gnusocial.php (100%) rename lib/{ => util}/htmloutputter.php (100%) rename lib/{ => util}/httpclient.php (100%) rename lib/{ => util}/infoaction.php (100%) rename lib/{ => util}/installer.php (100%) rename lib/{ => util}/internalsessionhandler.php (100%) rename lib/{ => util}/iomanager.php (100%) rename lib/{ => util}/iomaster.php (100%) rename lib/{ => util}/language.php (100%) rename lib/{ => util}/location.php (100%) rename lib/{ => util}/mail.php (100%) rename lib/{ => util}/mailhandler.php (100%) rename lib/{ => util}/managedaction.php (100%) rename lib/{ => util}/oauthclient.php (100%) rename lib/{ => util}/parallelizingdaemon.php (100%) rename lib/{ => util}/ping.php (100%) rename lib/{ => util}/processmanager.php (100%) rename lib/{ => util}/redirectingaction.php (100%) rename lib/{ => util}/right.php (100%) rename lib/{ => util}/router.php (100%) rename lib/{ => util}/spawningdaemon.php (100%) rename lib/{ => util}/taguri.php (100%) rename lib/{ => util}/themeuploader.php (100%) rename lib/{ => util}/urlmapper.php (100%) rename lib/{ => util}/util.php (100%) rename lib/{ => util}/uuid.php (100%) rename lib/{ => util}/webcolor.php (100%) rename lib/{ => util}/xmloutputter.php (100%) rename lib/{ => util}/xmlstringer.php (100%) diff --git a/actions/featured.php b/actions/featured.php index 5609d6bace..1844f08c9a 100644 --- a/actions/featured.php +++ b/actions/featured.php @@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/profilelist.php'; -require_once INSTALLDIR.'/lib/publicgroupnav.php'; +require_once INSTALLDIR . '/lib/profilelist.php'; +require_once INSTALLDIR . '/lib/publicgroupnav.php'; /** * List of featured users diff --git a/actions/groupqueue.php b/actions/groupqueue.php index 98da77e01a..6699338f0c 100644 --- a/actions/groupqueue.php +++ b/actions/groupqueue.php @@ -31,8 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once(INSTALLDIR.'/lib/profilelist.php'); -require_once INSTALLDIR.'/lib/publicgroupnav.php'; +require_once(INSTALLDIR . '/lib/profilelist.php'); +require_once INSTALLDIR . '/lib/publicgroupnav.php'; /** * List of group members diff --git a/actions/groups.php b/actions/groups.php index 2e88d0a960..5971cf2227 100644 --- a/actions/groups.php +++ b/actions/groups.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/grouplist.php'; +require_once INSTALLDIR . '/lib/grouplist.php'; /** * Latest groups diff --git a/actions/noticesearch.php b/actions/noticesearch.php index ddc4bd477c..2968c8de4d 100644 --- a/actions/noticesearch.php +++ b/actions/noticesearch.php @@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/searchaction.php'; +require_once INSTALLDIR . '/lib/searchaction.php'; /** * Notice search action class. diff --git a/actions/nudge.php b/actions/nudge.php index 8ade7fa272..7cadcbde14 100644 --- a/actions/nudge.php +++ b/actions/nudge.php @@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/mail.php'; +require_once INSTALLDIR . '/lib/mail.php'; /** * Nudge a user action class. diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php index 6bc35828ec..e4c59bd687 100644 --- a/actions/peoplesearch.php +++ b/actions/peoplesearch.php @@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/searchaction.php'; -require_once INSTALLDIR.'/lib/profilelist.php'; +require_once INSTALLDIR . '/lib/searchaction.php'; +require_once INSTALLDIR . '/lib/profilelist.php'; /** * People search action class. diff --git a/actions/peopletag.php b/actions/peopletag.php index ed811ce262..8dcb75c04a 100644 --- a/actions/peopletag.php +++ b/actions/peopletag.php @@ -35,7 +35,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/peopletaglist.php'; +require_once INSTALLDIR . '/lib/peopletaglist.php'; // cache 3 pages define('PEOPLETAG_CACHE_WINDOW', PEOPLETAGS_PER_PAGE*3 + 1); diff --git a/actions/peopletagged.php b/actions/peopletagged.php index db2420a8a3..b9b2af2dd8 100644 --- a/actions/peopletagged.php +++ b/actions/peopletagged.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once(INSTALLDIR.'/lib/profilelist.php'); +require_once(INSTALLDIR . '/lib/profilelist.php'); /** * List of people tagged by the user with a tag diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php index 7463108774..548e1329d5 100644 --- a/actions/peopletagsbyuser.php +++ b/actions/peopletagsbyuser.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/peopletaglist.php'; +require_once INSTALLDIR . '/lib/peopletaglist.php'; class PeopletagsbyuserAction extends Action { diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php index a930328156..eb248a931f 100644 --- a/actions/peopletagsforuser.php +++ b/actions/peopletagsforuser.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/peopletaglist.php'; +require_once INSTALLDIR . '/lib/peopletaglist.php'; class PeopletagsforuserAction extends Action { diff --git a/actions/peopletagsubscribers.php b/actions/peopletagsubscribers.php index 927cf66e64..d8eecc5de5 100644 --- a/actions/peopletagsubscribers.php +++ b/actions/peopletagsubscribers.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once(INSTALLDIR.'/lib/profilelist.php'); +require_once(INSTALLDIR . '/lib/profilelist.php'); /** * List of peopletag subscribers diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php index ae491bbe59..cd9da991c0 100644 --- a/actions/peopletagsubscriptions.php +++ b/actions/peopletagsubscriptions.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/peopletaglist.php'; +require_once INSTALLDIR . '/lib/peopletaglist.php'; class PeopletagsubscriptionsAction extends Action { diff --git a/actions/shownotice.php b/actions/shownotice.php index a2fa01d21a..0db6e43e5d 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -31,7 +31,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } -require_once INSTALLDIR.'/lib/noticelist.php'; +require_once INSTALLDIR . '/lib/noticelist.php'; /** * Show a single notice diff --git a/actions/usergroups.php b/actions/usergroups.php index ce5dc20178..6174179802 100644 --- a/actions/usergroups.php +++ b/actions/usergroups.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/grouplist.php'; +require_once INSTALLDIR . '/lib/grouplist.php'; /** * User groups page diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 3de7c16d9b..9d27c16904 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -573,7 +573,7 @@ class Memcached_DataObject extends Safe_DataObject function getSearchEngine($table) { - require_once INSTALLDIR.'/lib/search_engines.php'; + require_once INSTALLDIR . '/lib/search_engines.php'; if (Event::handle('GetSearchEngine', array($this, $table, &$search_engine))) { if ('mysql' === common_config('db', 'type')) { diff --git a/classes/Notice.php b/classes/Notice.php index 6d67d0d9d1..e5cdfae79a 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1890,7 +1890,7 @@ class Notice extends Managed_DataObject $recipientIds = $this->getReplies(); if (Event::handle('StartNotifyMentioned', array($this, &$recipientIds))) { - require_once INSTALLDIR.'/lib/mail.php'; + require_once INSTALLDIR . '/lib/mail.php'; foreach ($recipientIds as $recipientId) { try { diff --git a/lib/action.php b/lib/action/action.php similarity index 100% rename from lib/action.php rename to lib/action/action.php diff --git a/lib/erroraction.php b/lib/action/erroraction.php similarity index 100% rename from lib/erroraction.php rename to lib/action/erroraction.php diff --git a/lib/servererroraction.php b/lib/action/servererroraction.php similarity index 100% rename from lib/servererroraction.php rename to lib/action/servererroraction.php diff --git a/lib/activity.php b/lib/activitystreams/activity.php similarity index 100% rename from lib/activity.php rename to lib/activitystreams/activity.php diff --git a/lib/activitycontext.php b/lib/activitystreams/activitycontext.php similarity index 100% rename from lib/activitycontext.php rename to lib/activitystreams/activitycontext.php diff --git a/lib/activityimporter.php b/lib/activitystreams/activityimporter.php similarity index 100% rename from lib/activityimporter.php rename to lib/activitystreams/activityimporter.php diff --git a/lib/activitymover.php b/lib/activitystreams/activitymover.php similarity index 100% rename from lib/activitymover.php rename to lib/activitystreams/activitymover.php diff --git a/lib/activityobject.php b/lib/activitystreams/activityobject.php similarity index 100% rename from lib/activityobject.php rename to lib/activitystreams/activityobject.php diff --git a/lib/activitystreamjsondocument.php b/lib/activitystreams/activitystreamjsondocument.php similarity index 100% rename from lib/activitystreamjsondocument.php rename to lib/activitystreams/activitystreamjsondocument.php diff --git a/lib/activitystreamslink.php b/lib/activitystreams/activitystreamslink.php similarity index 100% rename from lib/activitystreamslink.php rename to lib/activitystreams/activitystreamslink.php diff --git a/lib/activitystreamsmedialink.php b/lib/activitystreams/activitystreamsmedialink.php similarity index 100% rename from lib/activitystreamsmedialink.php rename to lib/activitystreams/activitystreamsmedialink.php diff --git a/lib/activityutils.php b/lib/activitystreams/activityutils.php similarity index 100% rename from lib/activityutils.php rename to lib/activitystreams/activityutils.php diff --git a/lib/activityverb.php b/lib/activitystreams/activityverb.php similarity index 100% rename from lib/activityverb.php rename to lib/activitystreams/activityverb.php diff --git a/lib/jsonactivitycollection.php b/lib/activitystreams/jsonactivitycollection.php similarity index 100% rename from lib/jsonactivitycollection.php rename to lib/activitystreams/jsonactivitycollection.php diff --git a/lib/useractivitystream.php b/lib/activitystreams/useractivitystream.php similarity index 99% rename from lib/useractivitystream.php rename to lib/activitystreams/useractivitystream.php index cc0e4297e6..656fe9d81f 100644 --- a/lib/useractivitystream.php +++ b/lib/activitystreams/useractivitystream.php @@ -359,7 +359,7 @@ class UserActivityStream extends AtomUserNoticeFeed function writeJSON($handle) { - require_once INSTALLDIR.'/lib/activitystreamjsondocument.php'; + require_once INSTALLDIR . '/lib/activitystreamjsondocument.php'; fwrite($handle, '{"items": ['); $this->renderEntries(Feed::JSON, $handle); fwrite($handle, ']}'); diff --git a/lib/adminform.php b/lib/admin/adminform.php similarity index 100% rename from lib/adminform.php rename to lib/admin/adminform.php diff --git a/lib/adminpanelaction.php b/lib/admin/adminpanelaction.php similarity index 100% rename from lib/adminpanelaction.php rename to lib/admin/adminpanelaction.php diff --git a/lib/adminpanelnav.php b/lib/admin/adminpanelnav.php similarity index 100% rename from lib/adminpanelnav.php rename to lib/admin/adminpanelnav.php diff --git a/lib/deletegroupform.php b/lib/admin/deletegroupform.php similarity index 100% rename from lib/deletegroupform.php rename to lib/admin/deletegroupform.php diff --git a/lib/deleteuserform.php b/lib/admin/deleteuserform.php similarity index 100% rename from lib/deleteuserform.php rename to lib/admin/deleteuserform.php diff --git a/lib/deluserqueuehandler.php b/lib/admin/deluserqueuehandler.php similarity index 100% rename from lib/deluserqueuehandler.php rename to lib/admin/deluserqueuehandler.php diff --git a/lib/grantroleform.php b/lib/admin/grantroleform.php similarity index 100% rename from lib/grantroleform.php rename to lib/admin/grantroleform.php diff --git a/lib/plugindeleteform.php b/lib/admin/plugindeleteform.php similarity index 100% rename from lib/plugindeleteform.php rename to lib/admin/plugindeleteform.php diff --git a/lib/plugindisableform.php b/lib/admin/plugindisableform.php similarity index 100% rename from lib/plugindisableform.php rename to lib/admin/plugindisableform.php diff --git a/lib/pluginenableform.php b/lib/admin/pluginenableform.php similarity index 100% rename from lib/pluginenableform.php rename to lib/admin/pluginenableform.php diff --git a/lib/pluginlist.php b/lib/admin/pluginlist.php similarity index 100% rename from lib/pluginlist.php rename to lib/admin/pluginlist.php diff --git a/lib/revokeroleform.php b/lib/admin/revokeroleform.php similarity index 100% rename from lib/revokeroleform.php rename to lib/admin/revokeroleform.php diff --git a/lib/sandboxform.php b/lib/admin/sandboxform.php similarity index 100% rename from lib/sandboxform.php rename to lib/admin/sandboxform.php diff --git a/lib/silenceform.php b/lib/admin/silenceform.php similarity index 100% rename from lib/silenceform.php rename to lib/admin/silenceform.php diff --git a/lib/unsandboxform.php b/lib/admin/unsandboxform.php similarity index 100% rename from lib/unsandboxform.php rename to lib/admin/unsandboxform.php diff --git a/lib/unsilenceform.php b/lib/admin/unsilenceform.php similarity index 100% rename from lib/unsilenceform.php rename to lib/admin/unsilenceform.php diff --git a/lib/apiaction.php b/lib/api/apiaction.php similarity index 100% rename from lib/apiaction.php rename to lib/api/apiaction.php diff --git a/lib/apiauthaction.php b/lib/api/apiauthaction.php similarity index 100% rename from lib/apiauthaction.php rename to lib/api/apiauthaction.php diff --git a/lib/apibareauthaction.php b/lib/api/apibareauthaction.php similarity index 100% rename from lib/apibareauthaction.php rename to lib/api/apibareauthaction.php diff --git a/lib/apignusocialoauthdatastore.php b/lib/api/apignusocialoauthdatastore.php similarity index 100% rename from lib/apignusocialoauthdatastore.php rename to lib/api/apignusocialoauthdatastore.php diff --git a/lib/apilistusers.php b/lib/api/apilistusers.php similarity index 100% rename from lib/apilistusers.php rename to lib/api/apilistusers.php diff --git a/lib/apioauthaction.php b/lib/api/apioauthaction.php similarity index 100% rename from lib/apioauthaction.php rename to lib/api/apioauthaction.php diff --git a/lib/apiprivateauthaction.php b/lib/api/apiprivateauthaction.php similarity index 100% rename from lib/apiprivateauthaction.php rename to lib/api/apiprivateauthaction.php diff --git a/lib/applicationeditform.php b/lib/application/applicationeditform.php similarity index 100% rename from lib/applicationeditform.php rename to lib/application/applicationeditform.php diff --git a/lib/applicationlist.php b/lib/application/applicationlist.php similarity index 100% rename from lib/applicationlist.php rename to lib/application/applicationlist.php diff --git a/lib/connectedappslist.php b/lib/application/connectedappslist.php similarity index 100% rename from lib/connectedappslist.php rename to lib/application/connectedappslist.php diff --git a/lib/cache.php b/lib/cache/cache.php similarity index 100% rename from lib/cache.php rename to lib/cache/cache.php diff --git a/lib/columndef.php b/lib/database/db/columndef.php similarity index 100% rename from lib/columndef.php rename to lib/database/db/columndef.php diff --git a/lib/dberroraction.php b/lib/database/dberroraction.php similarity index 97% rename from lib/dberroraction.php rename to lib/database/dberroraction.php index 8f628fba17..98c11932bd 100644 --- a/lib/dberroraction.php +++ b/lib/database/dberroraction.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/servererroraction.php'; +require_once INSTALLDIR . '/lib/servererroraction.php'; /** * Class for displaying DB Errors diff --git a/lib/mysqlschema.php b/lib/database/mysqlschema.php similarity index 100% rename from lib/mysqlschema.php rename to lib/database/mysqlschema.php diff --git a/lib/pgsqlschema.php b/lib/database/pgsqlschema.php similarity index 100% rename from lib/pgsqlschema.php rename to lib/database/pgsqlschema.php diff --git a/lib/schema.php b/lib/database/schema.php similarity index 100% rename from lib/schema.php rename to lib/database/schema.php diff --git a/lib/schemaupdater.php b/lib/database/schemaupdater.php similarity index 100% rename from lib/schemaupdater.php rename to lib/database/schemaupdater.php diff --git a/lib/tabledef.php b/lib/database/tabledef.php similarity index 100% rename from lib/tabledef.php rename to lib/database/tabledef.php diff --git a/lib/alreadyfulfilledexception.php b/lib/exceptions/alreadyfulfilledexception.php similarity index 100% rename from lib/alreadyfulfilledexception.php rename to lib/exceptions/alreadyfulfilledexception.php diff --git a/lib/authorizationexception.php b/lib/exceptions/authorizationexception.php similarity index 100% rename from lib/authorizationexception.php rename to lib/exceptions/authorizationexception.php diff --git a/lib/clientexception.php b/lib/exceptions/clientexception.php similarity index 100% rename from lib/clientexception.php rename to lib/exceptions/clientexception.php diff --git a/lib/configexception.php b/lib/exceptions/configexception.php similarity index 100% rename from lib/configexception.php rename to lib/exceptions/configexception.php diff --git a/lib/emailexception.php b/lib/exceptions/emailexception.php similarity index 100% rename from lib/emailexception.php rename to lib/exceptions/emailexception.php diff --git a/lib/emptypkeyvalueexception.php b/lib/exceptions/emptypkeyvalueexception.php similarity index 100% rename from lib/emptypkeyvalueexception.php rename to lib/exceptions/emptypkeyvalueexception.php diff --git a/lib/filenotfoundexception.php b/lib/exceptions/filenotfoundexception.php similarity index 100% rename from lib/filenotfoundexception.php rename to lib/exceptions/filenotfoundexception.php diff --git a/lib/filenotstoredlocallyexception.php b/lib/exceptions/filenotstoredlocallyexception.php similarity index 100% rename from lib/filenotstoredlocallyexception.php rename to lib/exceptions/filenotstoredlocallyexception.php diff --git a/lib/groupnoprofileexception.php b/lib/exceptions/groupnoprofileexception.php similarity index 100% rename from lib/groupnoprofileexception.php rename to lib/exceptions/groupnoprofileexception.php diff --git a/lib/invalidfilenameexception.php b/lib/exceptions/invalidfilenameexception.php similarity index 100% rename from lib/invalidfilenameexception.php rename to lib/exceptions/invalidfilenameexception.php diff --git a/lib/invalidurlexception.php b/lib/exceptions/invalidurlexception.php similarity index 100% rename from lib/invalidurlexception.php rename to lib/exceptions/invalidurlexception.php diff --git a/lib/methodnotimplementedexception.php b/lib/exceptions/methodnotimplementedexception.php similarity index 100% rename from lib/methodnotimplementedexception.php rename to lib/exceptions/methodnotimplementedexception.php diff --git a/lib/noavatarexception.php b/lib/exceptions/noavatarexception.php similarity index 100% rename from lib/noavatarexception.php rename to lib/exceptions/noavatarexception.php diff --git a/lib/nohttpresponseexception.php b/lib/exceptions/nohttpresponseexception.php similarity index 100% rename from lib/nohttpresponseexception.php rename to lib/exceptions/nohttpresponseexception.php diff --git a/lib/noobjecttypeexception.php b/lib/exceptions/noobjecttypeexception.php similarity index 100% rename from lib/noobjecttypeexception.php rename to lib/exceptions/noobjecttypeexception.php diff --git a/lib/noparentnoticeexception.php b/lib/exceptions/noparentnoticeexception.php similarity index 100% rename from lib/noparentnoticeexception.php rename to lib/exceptions/noparentnoticeexception.php diff --git a/lib/noprofileexception.php b/lib/exceptions/noprofileexception.php similarity index 100% rename from lib/noprofileexception.php rename to lib/exceptions/noprofileexception.php diff --git a/lib/noqueuehandlerexception.php b/lib/exceptions/noqueuehandlerexception.php similarity index 100% rename from lib/noqueuehandlerexception.php rename to lib/exceptions/noqueuehandlerexception.php diff --git a/lib/noresultexception.php b/lib/exceptions/noresultexception.php similarity index 100% rename from lib/noresultexception.php rename to lib/exceptions/noresultexception.php diff --git a/lib/noroutemapexception.php b/lib/exceptions/noroutemapexception.php similarity index 100% rename from lib/noroutemapexception.php rename to lib/exceptions/noroutemapexception.php diff --git a/lib/nosuchgroupexception.php b/lib/exceptions/nosuchgroupexception.php similarity index 100% rename from lib/nosuchgroupexception.php rename to lib/exceptions/nosuchgroupexception.php diff --git a/lib/nosuchuserexception.php b/lib/exceptions/nosuchuserexception.php similarity index 100% rename from lib/nosuchuserexception.php rename to lib/exceptions/nosuchuserexception.php diff --git a/lib/nouploadedmediaexception.php b/lib/exceptions/nouploadedmediaexception.php similarity index 100% rename from lib/nouploadedmediaexception.php rename to lib/exceptions/nouploadedmediaexception.php diff --git a/lib/nouriexception.php b/lib/exceptions/nouriexception.php similarity index 100% rename from lib/nouriexception.php rename to lib/exceptions/nouriexception.php diff --git a/lib/passwordhashexception.php b/lib/exceptions/passwordhashexception.php similarity index 100% rename from lib/passwordhashexception.php rename to lib/exceptions/passwordhashexception.php diff --git a/lib/privatestreamexception.php b/lib/exceptions/privatestreamexception.php similarity index 100% rename from lib/privatestreamexception.php rename to lib/exceptions/privatestreamexception.php diff --git a/lib/profilenoaccturiexception.php b/lib/exceptions/profilenoaccturiexception.php similarity index 100% rename from lib/profilenoaccturiexception.php rename to lib/exceptions/profilenoaccturiexception.php diff --git a/lib/serverexception.php b/lib/exceptions/serverexception.php similarity index 100% rename from lib/serverexception.php rename to lib/exceptions/serverexception.php diff --git a/lib/unknownextensionmimeexception.php b/lib/exceptions/unknownextensionmimeexception.php similarity index 100% rename from lib/unknownextensionmimeexception.php rename to lib/exceptions/unknownextensionmimeexception.php diff --git a/lib/unknownmimeextensionexception.php b/lib/exceptions/unknownmimeextensionexception.php similarity index 100% rename from lib/unknownmimeextensionexception.php rename to lib/exceptions/unknownmimeextensionexception.php diff --git a/lib/unknownuriexception.php b/lib/exceptions/unknownuriexception.php similarity index 100% rename from lib/unknownuriexception.php rename to lib/exceptions/unknownuriexception.php diff --git a/lib/unsupportedmediaexception.php b/lib/exceptions/unsupportedmediaexception.php similarity index 100% rename from lib/unsupportedmediaexception.php rename to lib/exceptions/unsupportedmediaexception.php diff --git a/lib/usefileasthumbnailexception.php b/lib/exceptions/usefileasthumbnailexception.php similarity index 100% rename from lib/usefileasthumbnailexception.php rename to lib/exceptions/usefileasthumbnailexception.php diff --git a/lib/usernoprofileexception.php b/lib/exceptions/usernoprofileexception.php similarity index 100% rename from lib/usernoprofileexception.php rename to lib/exceptions/usernoprofileexception.php diff --git a/lib/activitysink.php b/lib/feeds/activitysink.php similarity index 100% rename from lib/activitysink.php rename to lib/feeds/activitysink.php diff --git a/lib/activitysource.php b/lib/feeds/activitysource.php similarity index 100% rename from lib/activitysource.php rename to lib/feeds/activitysource.php diff --git a/lib/atom10feed.php b/lib/feeds/atom10feed.php similarity index 100% rename from lib/atom10feed.php rename to lib/feeds/atom10feed.php diff --git a/lib/atomcategory.php b/lib/feeds/atomcategory.php similarity index 100% rename from lib/atomcategory.php rename to lib/feeds/atomcategory.php diff --git a/lib/atomgroupnoticefeed.php b/lib/feeds/atomgroupnoticefeed.php similarity index 100% rename from lib/atomgroupnoticefeed.php rename to lib/feeds/atomgroupnoticefeed.php diff --git a/lib/atomlistnoticefeed.php b/lib/feeds/atomlistnoticefeed.php similarity index 100% rename from lib/atomlistnoticefeed.php rename to lib/feeds/atomlistnoticefeed.php diff --git a/lib/atomnoticefeed.php b/lib/feeds/atomnoticefeed.php similarity index 100% rename from lib/atomnoticefeed.php rename to lib/feeds/atomnoticefeed.php diff --git a/lib/atompubaction.php b/lib/feeds/atompubaction.php similarity index 100% rename from lib/atompubaction.php rename to lib/feeds/atompubaction.php diff --git a/lib/atompubclient.php b/lib/feeds/atompubclient.php similarity index 100% rename from lib/atompubclient.php rename to lib/feeds/atompubclient.php diff --git a/lib/atomusernoticefeed.php b/lib/feeds/atomusernoticefeed.php similarity index 100% rename from lib/atomusernoticefeed.php rename to lib/feeds/atomusernoticefeed.php diff --git a/lib/feed.php b/lib/feeds/feed.php similarity index 100% rename from lib/feed.php rename to lib/feeds/feed.php diff --git a/lib/feedimporter.php b/lib/feeds/feedimporter.php similarity index 100% rename from lib/feedimporter.php rename to lib/feeds/feedimporter.php diff --git a/lib/feedlist.php b/lib/feeds/feedlist.php similarity index 100% rename from lib/feedlist.php rename to lib/feeds/feedlist.php diff --git a/lib/rss10action.php b/lib/feeds/rss10action.php similarity index 100% rename from lib/rss10action.php rename to lib/feeds/rss10action.php diff --git a/lib/targetedrss10action.php b/lib/feeds/targetedrss10action.php similarity index 100% rename from lib/targetedrss10action.php rename to lib/feeds/targetedrss10action.php diff --git a/lib/approvegroupform.php b/lib/groups/approvegroupform.php similarity index 98% rename from lib/approvegroupform.php rename to lib/groups/approvegroupform.php index 561b204ea9..e64c095a73 100644 --- a/lib/approvegroupform.php +++ b/lib/groups/approvegroupform.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for leaving a group diff --git a/lib/cancelgroupform.php b/lib/groups/cancelgroupform.php similarity index 100% rename from lib/cancelgroupform.php rename to lib/groups/cancelgroupform.php diff --git a/lib/groupaction.php b/lib/groups/groupaction.php similarity index 100% rename from lib/groupaction.php rename to lib/groups/groupaction.php diff --git a/lib/groupadminsection.php b/lib/groups/groupadminsection.php similarity index 100% rename from lib/groupadminsection.php rename to lib/groups/groupadminsection.php diff --git a/lib/groupblockedminilist.php b/lib/groups/groupblockedminilist.php similarity index 100% rename from lib/groupblockedminilist.php rename to lib/groups/groupblockedminilist.php diff --git a/lib/groupblockedminilistitem.php b/lib/groups/groupblockedminilistitem.php similarity index 100% rename from lib/groupblockedminilistitem.php rename to lib/groups/groupblockedminilistitem.php diff --git a/lib/groupblockform.php b/lib/groups/groupblockform.php similarity index 100% rename from lib/groupblockform.php rename to lib/groups/groupblockform.php diff --git a/lib/groupeditform.php b/lib/groups/groupeditform.php similarity index 99% rename from lib/groupeditform.php rename to lib/groups/groupeditform.php index 9061af2336..9e9c48d137 100644 --- a/lib/groupeditform.php +++ b/lib/groups/groupeditform.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for editing a group diff --git a/lib/grouplist.php b/lib/groups/grouplist.php similarity index 99% rename from lib/grouplist.php rename to lib/groups/grouplist.php index 39e904222a..dc556d874b 100644 --- a/lib/grouplist.php +++ b/lib/groups/grouplist.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/widget.php'; +require_once INSTALLDIR . '/lib/widget.php'; /** * Widget to show a list of groups diff --git a/lib/groupmemberlist.php b/lib/groups/groupmemberlist.php similarity index 100% rename from lib/groupmemberlist.php rename to lib/groups/groupmemberlist.php diff --git a/lib/groupmemberlistitem.php b/lib/groups/groupmemberlistitem.php similarity index 100% rename from lib/groupmemberlistitem.php rename to lib/groups/groupmemberlistitem.php diff --git a/lib/groupmembersminilist.php b/lib/groups/groupmembersminilist.php similarity index 100% rename from lib/groupmembersminilist.php rename to lib/groups/groupmembersminilist.php diff --git a/lib/groupmembersminilistitem.php b/lib/groups/groupmembersminilistitem.php similarity index 100% rename from lib/groupmembersminilistitem.php rename to lib/groups/groupmembersminilistitem.php diff --git a/lib/groupminilist.php b/lib/groups/groupminilist.php similarity index 98% rename from lib/groupminilist.php rename to lib/groups/groupminilist.php index 8212b81b17..fe4a405dc3 100644 --- a/lib/groupminilist.php +++ b/lib/groups/groupminilist.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/grouplist.php'; +require_once INSTALLDIR . '/lib/grouplist.php'; /** * Widget to show a list of groups, good for sidebar diff --git a/lib/groupnoticestream.php b/lib/groups/groupnoticestream.php similarity index 100% rename from lib/groupnoticestream.php rename to lib/groups/groupnoticestream.php diff --git a/lib/groupprofileblock.php b/lib/groups/groupprofileblock.php similarity index 100% rename from lib/groupprofileblock.php rename to lib/groups/groupprofileblock.php diff --git a/lib/groupsbymemberssection.php b/lib/groups/groupsbymemberssection.php similarity index 100% rename from lib/groupsbymemberssection.php rename to lib/groups/groupsbymemberssection.php diff --git a/lib/groupsbypostssection.php b/lib/groups/groupsbypostssection.php similarity index 100% rename from lib/groupsbypostssection.php rename to lib/groups/groupsbypostssection.php diff --git a/lib/groupsection.php b/lib/groups/groupsection.php similarity index 100% rename from lib/groupsection.php rename to lib/groups/groupsection.php diff --git a/lib/groupsnav.php b/lib/groups/groupsnav.php similarity index 100% rename from lib/groupsnav.php rename to lib/groups/groupsnav.php diff --git a/lib/joinform.php b/lib/groups/joinform.php similarity index 100% rename from lib/joinform.php rename to lib/groups/joinform.php diff --git a/lib/leaveform.php b/lib/groups/leaveform.php similarity index 100% rename from lib/leaveform.php rename to lib/groups/leaveform.php diff --git a/lib/makeadminform.php b/lib/groups/makeadminform.php similarity index 100% rename from lib/makeadminform.php rename to lib/groups/makeadminform.php diff --git a/lib/publicgroupnav.php b/lib/groups/publicgroupnav.php similarity index 100% rename from lib/publicgroupnav.php rename to lib/groups/publicgroupnav.php diff --git a/lib/threadinggroupnoticestream.php b/lib/groups/threadinggroupnoticestream.php similarity index 100% rename from lib/threadinggroupnoticestream.php rename to lib/groups/threadinggroupnoticestream.php diff --git a/lib/imchannel.php b/lib/im/imchannel.php similarity index 100% rename from lib/imchannel.php rename to lib/im/imchannel.php diff --git a/lib/immanager.php b/lib/im/immanager.php similarity index 100% rename from lib/immanager.php rename to lib/im/immanager.php diff --git a/lib/imqueuehandler.php b/lib/im/imqueuehandler.php similarity index 100% rename from lib/imqueuehandler.php rename to lib/im/imqueuehandler.php diff --git a/lib/imreceiverqueuehandler.php b/lib/im/imreceiverqueuehandler.php similarity index 100% rename from lib/imreceiverqueuehandler.php rename to lib/im/imreceiverqueuehandler.php diff --git a/lib/imsenderqueuehandler.php b/lib/im/imsenderqueuehandler.php similarity index 100% rename from lib/imsenderqueuehandler.php rename to lib/im/imsenderqueuehandler.php diff --git a/lib/attachment.php b/lib/media/attachment.php similarity index 100% rename from lib/attachment.php rename to lib/media/attachment.php diff --git a/lib/attachmentlist.php b/lib/media/attachmentlist.php similarity index 100% rename from lib/attachmentlist.php rename to lib/media/attachmentlist.php diff --git a/lib/attachmentlistitem.php b/lib/media/attachmentlistitem.php similarity index 100% rename from lib/attachmentlistitem.php rename to lib/media/attachmentlistitem.php diff --git a/lib/attachmentnoticesection.php b/lib/media/attachmentnoticesection.php similarity index 100% rename from lib/attachmentnoticesection.php rename to lib/media/attachmentnoticesection.php diff --git a/lib/imagefile.php b/lib/media/imagefile.php similarity index 100% rename from lib/imagefile.php rename to lib/media/imagefile.php diff --git a/lib/inlineattachmentlist.php b/lib/media/inlineattachmentlist.php similarity index 100% rename from lib/inlineattachmentlist.php rename to lib/media/inlineattachmentlist.php diff --git a/lib/inlineattachmentlistitem.php b/lib/media/inlineattachmentlistitem.php similarity index 100% rename from lib/inlineattachmentlistitem.php rename to lib/media/inlineattachmentlistitem.php diff --git a/lib/mediafile.php b/lib/media/mediafile.php similarity index 100% rename from lib/mediafile.php rename to lib/media/mediafile.php diff --git a/lib/cachingnoticestream.php b/lib/notices/cachingnoticestream.php similarity index 100% rename from lib/cachingnoticestream.php rename to lib/notices/cachingnoticestream.php diff --git a/lib/conversationnoticestream.php b/lib/notices/conversationnoticestream.php similarity index 100% rename from lib/conversationnoticestream.php rename to lib/notices/conversationnoticestream.php diff --git a/lib/distribqueuehandler.php b/lib/notices/distribqueuehandler.php similarity index 100% rename from lib/distribqueuehandler.php rename to lib/notices/distribqueuehandler.php diff --git a/lib/dofollowlistitem.php b/lib/notices/dofollowlistitem.php similarity index 98% rename from lib/dofollowlistitem.php rename to lib/notices/dofollowlistitem.php index f65f7b4cbb..87fdc3602b 100644 --- a/lib/dofollowlistitem.php +++ b/lib/notices/dofollowlistitem.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/noticelist.php'; +require_once INSTALLDIR . '/lib/noticelist.php'; /** * StatusNet, the distributed open-source microblogging tool diff --git a/lib/filenoticestream.php b/lib/notices/filenoticestream.php similarity index 100% rename from lib/filenoticestream.php rename to lib/notices/filenoticestream.php diff --git a/lib/filteringnoticestream.php b/lib/notices/filteringnoticestream.php similarity index 100% rename from lib/filteringnoticestream.php rename to lib/notices/filteringnoticestream.php diff --git a/lib/fullnoticestream.php b/lib/notices/fullnoticestream.php similarity index 100% rename from lib/fullnoticestream.php rename to lib/notices/fullnoticestream.php diff --git a/lib/fullthreadednoticelist.php b/lib/notices/fullthreadednoticelist.php similarity index 100% rename from lib/fullthreadednoticelist.php rename to lib/notices/fullthreadednoticelist.php diff --git a/lib/inboxnoticestream.php b/lib/notices/inboxnoticestream.php similarity index 100% rename from lib/inboxnoticestream.php rename to lib/notices/inboxnoticestream.php diff --git a/lib/jsonsearchresultslist.php b/lib/notices/jsonsearchresultslist.php similarity index 100% rename from lib/jsonsearchresultslist.php rename to lib/notices/jsonsearchresultslist.php diff --git a/lib/listsnav.php b/lib/notices/listsnav.php similarity index 100% rename from lib/listsnav.php rename to lib/notices/listsnav.php diff --git a/lib/moderatednoticestream.php b/lib/notices/moderatednoticestream.php similarity index 100% rename from lib/moderatednoticestream.php rename to lib/notices/moderatednoticestream.php diff --git a/lib/networkpublicnoticestream.php b/lib/notices/networkpublicnoticestream.php similarity index 100% rename from lib/networkpublicnoticestream.php rename to lib/notices/networkpublicnoticestream.php diff --git a/lib/noticeform.php b/lib/notices/noticeform.php similarity index 100% rename from lib/noticeform.php rename to lib/notices/noticeform.php diff --git a/lib/noticelist.php b/lib/notices/noticelist.php similarity index 100% rename from lib/noticelist.php rename to lib/notices/noticelist.php diff --git a/lib/noticelistactorsitem.php b/lib/notices/noticelistactorsitem.php similarity index 100% rename from lib/noticelistactorsitem.php rename to lib/notices/noticelistactorsitem.php diff --git a/lib/noticelistitem.php b/lib/notices/noticelistitem.php similarity index 100% rename from lib/noticelistitem.php rename to lib/notices/noticelistitem.php diff --git a/lib/noticelistitemadapter.php b/lib/notices/noticelistitemadapter.php similarity index 100% rename from lib/noticelistitemadapter.php rename to lib/notices/noticelistitemadapter.php diff --git a/lib/noticesaveexception.php b/lib/notices/noticesaveexception.php similarity index 100% rename from lib/noticesaveexception.php rename to lib/notices/noticesaveexception.php diff --git a/lib/noticesection.php b/lib/notices/noticesection.php similarity index 100% rename from lib/noticesection.php rename to lib/notices/noticesection.php diff --git a/lib/noticestream.php b/lib/notices/noticestream.php similarity index 100% rename from lib/noticestream.php rename to lib/notices/noticestream.php diff --git a/lib/noticestreamaction.php b/lib/notices/noticestreamaction.php similarity index 100% rename from lib/noticestreamaction.php rename to lib/notices/noticestreamaction.php diff --git a/lib/primarynoticelist.php b/lib/notices/primarynoticelist.php similarity index 100% rename from lib/primarynoticelist.php rename to lib/notices/primarynoticelist.php diff --git a/lib/publicnoticestream.php b/lib/notices/publicnoticestream.php similarity index 100% rename from lib/publicnoticestream.php rename to lib/notices/publicnoticestream.php diff --git a/lib/replynoticestream.php b/lib/notices/replynoticestream.php similarity index 100% rename from lib/replynoticestream.php rename to lib/notices/replynoticestream.php diff --git a/lib/scopingnoticestream.php b/lib/notices/scopingnoticestream.php similarity index 100% rename from lib/scopingnoticestream.php rename to lib/notices/scopingnoticestream.php diff --git a/lib/sitestreamaction.php b/lib/notices/sitestreamaction.php similarity index 100% rename from lib/sitestreamaction.php rename to lib/notices/sitestreamaction.php diff --git a/lib/taggedprofilenoticestream.php b/lib/notices/taggedprofilenoticestream.php similarity index 100% rename from lib/taggedprofilenoticestream.php rename to lib/notices/taggedprofilenoticestream.php diff --git a/lib/tagnoticestream.php b/lib/notices/tagnoticestream.php similarity index 100% rename from lib/tagnoticestream.php rename to lib/notices/tagnoticestream.php diff --git a/lib/threadednoticelist.php b/lib/notices/threadednoticelist.php similarity index 100% rename from lib/threadednoticelist.php rename to lib/notices/threadednoticelist.php diff --git a/lib/threadednoticelistitem.php b/lib/notices/threadednoticelistitem.php similarity index 100% rename from lib/threadednoticelistitem.php rename to lib/notices/threadednoticelistitem.php diff --git a/lib/threadednoticelistmoreitem.php b/lib/notices/threadednoticelistmoreitem.php similarity index 100% rename from lib/threadednoticelistmoreitem.php rename to lib/notices/threadednoticelistmoreitem.php diff --git a/lib/threadednoticelistsubitem.php b/lib/notices/threadednoticelistsubitem.php similarity index 100% rename from lib/threadednoticelistsubitem.php rename to lib/notices/threadednoticelistsubitem.php diff --git a/lib/threadingnetworkpublicnoticestream.php b/lib/notices/threadingnetworkpublicnoticestream.php similarity index 100% rename from lib/threadingnetworkpublicnoticestream.php rename to lib/notices/threadingnetworkpublicnoticestream.php diff --git a/lib/threadingnoticestream.php b/lib/notices/threadingnoticestream.php similarity index 100% rename from lib/threadingnoticestream.php rename to lib/notices/threadingnoticestream.php diff --git a/lib/threadingpublicnoticestream.php b/lib/notices/threadingpublicnoticestream.php similarity index 100% rename from lib/threadingpublicnoticestream.php rename to lib/notices/threadingpublicnoticestream.php diff --git a/lib/poco.php b/lib/portablecontacts/poco.php similarity index 100% rename from lib/poco.php rename to lib/portablecontacts/poco.php diff --git a/lib/pocoaddress.php b/lib/portablecontacts/pocoaddress.php similarity index 100% rename from lib/pocoaddress.php rename to lib/portablecontacts/pocoaddress.php diff --git a/lib/pocourl.php b/lib/portablecontacts/pocourl.php similarity index 100% rename from lib/pocourl.php rename to lib/portablecontacts/pocourl.php diff --git a/lib/accountmover.php b/lib/profile/accountmover.php similarity index 100% rename from lib/accountmover.php rename to lib/profile/accountmover.php diff --git a/lib/accountprofileblock.php b/lib/profile/accountprofileblock.php similarity index 100% rename from lib/accountprofileblock.php rename to lib/profile/accountprofileblock.php diff --git a/lib/approvesubform.php b/lib/profile/approvesubform.php similarity index 100% rename from lib/approvesubform.php rename to lib/profile/approvesubform.php diff --git a/lib/avatarlink.php b/lib/profile/avatarlink.php similarity index 100% rename from lib/avatarlink.php rename to lib/profile/avatarlink.php diff --git a/lib/backupaccountform.php b/lib/profile/backupaccountform.php similarity index 100% rename from lib/backupaccountform.php rename to lib/profile/backupaccountform.php diff --git a/lib/blockform.php b/lib/profile/blockform.php similarity index 100% rename from lib/blockform.php rename to lib/profile/blockform.php diff --git a/lib/cancelsubscriptionform.php b/lib/profile/cancelsubscriptionform.php similarity index 97% rename from lib/cancelsubscriptionform.php rename to lib/profile/cancelsubscriptionform.php index a7b566da7b..153bd70184 100644 --- a/lib/cancelsubscriptionform.php +++ b/lib/profile/cancelsubscriptionform.php @@ -32,10 +32,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** - * Form for leaving a group + * Form for unsubscribing from a user * * @category Form * @package StatusNet diff --git a/lib/defaultprofileblock.php b/lib/profile/defaultprofileblock.php similarity index 100% rename from lib/defaultprofileblock.php rename to lib/profile/defaultprofileblock.php diff --git a/lib/logingroupnav.php b/lib/profile/logingroupnav.php similarity index 98% rename from lib/logingroupnav.php rename to lib/profile/logingroupnav.php index 5d1b52f795..22d8d18bad 100644 --- a/lib/logingroupnav.php +++ b/lib/profile/logingroupnav.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/widget.php'; +require_once INSTALLDIR . '/lib/widget.php'; /** * Menu for login group of actions diff --git a/lib/nickname.php b/lib/profile/nickname.php similarity index 100% rename from lib/nickname.php rename to lib/profile/nickname.php diff --git a/lib/nudgeform.php b/lib/profile/nudgeform.php similarity index 98% rename from lib/nudgeform.php rename to lib/profile/nudgeform.php index 9a86576a89..b692c540d0 100644 --- a/lib/nudgeform.php +++ b/lib/profile/nudgeform.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for nudging a user diff --git a/lib/peopletag.php b/lib/profile/peopletag.php similarity index 100% rename from lib/peopletag.php rename to lib/profile/peopletag.php diff --git a/lib/peopletageditform.php b/lib/profile/peopletageditform.php similarity index 98% rename from lib/peopletageditform.php rename to lib/profile/peopletageditform.php index c984880e2a..c0ddc5001e 100644 --- a/lib/peopletageditform.php +++ b/lib/profile/peopletageditform.php @@ -30,8 +30,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; -require_once INSTALLDIR.'/lib/togglepeopletag.php'; +require_once INSTALLDIR . '/lib/form.php'; +require_once INSTALLDIR . '/lib/togglepeopletag.php'; /** * Form for editing a peopletag diff --git a/lib/peopletaggroupnav.php b/lib/profile/peopletaggroupnav.php similarity index 99% rename from lib/peopletaggroupnav.php rename to lib/profile/peopletaggroupnav.php index 44e4756b81..cd4a7aaa06 100644 --- a/lib/peopletaggroupnav.php +++ b/lib/profile/peopletaggroupnav.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/widget.php'; +require_once INSTALLDIR . '/lib/widget.php'; /** * Base class for all actions diff --git a/lib/peopletaglist.php b/lib/profile/peopletaglist.php similarity index 100% rename from lib/peopletaglist.php rename to lib/profile/peopletaglist.php diff --git a/lib/peopletaglistitem.php b/lib/profile/peopletaglistitem.php similarity index 100% rename from lib/peopletaglistitem.php rename to lib/profile/peopletaglistitem.php diff --git a/lib/peopletagnav.php b/lib/profile/peopletagnav.php similarity index 99% rename from lib/peopletagnav.php rename to lib/profile/peopletagnav.php index e586c30de5..7a5511fe0e 100644 --- a/lib/peopletagnav.php +++ b/lib/profile/peopletagnav.php @@ -30,7 +30,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/widget.php'; +require_once INSTALLDIR . '/lib/widget.php'; /** * Tabset for a group diff --git a/lib/peopletagnoticestream.php b/lib/profile/peopletagnoticestream.php similarity index 100% rename from lib/peopletagnoticestream.php rename to lib/profile/peopletagnoticestream.php diff --git a/lib/peopletagsbysubssection.php b/lib/profile/peopletagsbysubssection.php similarity index 100% rename from lib/peopletagsbysubssection.php rename to lib/profile/peopletagsbysubssection.php diff --git a/lib/peopletagsection.php b/lib/profile/peopletagsection.php similarity index 100% rename from lib/peopletagsection.php rename to lib/profile/peopletagsection.php diff --git a/lib/peopletagsforusersection.php b/lib/profile/peopletagsforusersection.php similarity index 100% rename from lib/peopletagsforusersection.php rename to lib/profile/peopletagsforusersection.php diff --git a/lib/peopletagsubscriptionssection.php b/lib/profile/peopletagsubscriptionssection.php similarity index 100% rename from lib/peopletagsubscriptionssection.php rename to lib/profile/peopletagsubscriptionssection.php diff --git a/lib/peopletagswidget.php b/lib/profile/peopletagswidget.php similarity index 100% rename from lib/peopletagswidget.php rename to lib/profile/peopletagswidget.php diff --git a/lib/personalgroupnav.php b/lib/profile/personalgroupnav.php similarity index 100% rename from lib/personalgroupnav.php rename to lib/profile/personalgroupnav.php diff --git a/lib/profileaction.php b/lib/profile/profileaction.php similarity index 100% rename from lib/profileaction.php rename to lib/profile/profileaction.php diff --git a/lib/profileactionform.php b/lib/profile/profileactionform.php similarity index 100% rename from lib/profileactionform.php rename to lib/profile/profileactionform.php diff --git a/lib/profileblock.php b/lib/profile/profileblock.php similarity index 100% rename from lib/profileblock.php rename to lib/profile/profileblock.php diff --git a/lib/profileformaction.php b/lib/profile/profileformaction.php similarity index 100% rename from lib/profileformaction.php rename to lib/profile/profileformaction.php diff --git a/lib/profilelist.php b/lib/profile/profilelist.php similarity index 100% rename from lib/profilelist.php rename to lib/profile/profilelist.php diff --git a/lib/profilelistitem.php b/lib/profile/profilelistitem.php similarity index 100% rename from lib/profilelistitem.php rename to lib/profile/profilelistitem.php diff --git a/lib/profileminilist.php b/lib/profile/profileminilist.php similarity index 100% rename from lib/profileminilist.php rename to lib/profile/profileminilist.php diff --git a/lib/profileminilistitem.php b/lib/profile/profileminilistitem.php similarity index 100% rename from lib/profileminilistitem.php rename to lib/profile/profileminilistitem.php diff --git a/lib/profilenoticestream.php b/lib/profile/profilenoticestream.php similarity index 100% rename from lib/profilenoticestream.php rename to lib/profile/profilenoticestream.php diff --git a/lib/profilesection.php b/lib/profile/profilesection.php similarity index 100% rename from lib/profilesection.php rename to lib/profile/profilesection.php diff --git a/lib/subqueuelist.php b/lib/profile/subqueuelist.php similarity index 100% rename from lib/subqueuelist.php rename to lib/profile/subqueuelist.php diff --git a/lib/subqueuelistitem.php b/lib/profile/subqueuelistitem.php similarity index 100% rename from lib/subqueuelistitem.php rename to lib/profile/subqueuelistitem.php diff --git a/lib/subscribeform.php b/lib/profile/subscribeform.php similarity index 98% rename from lib/subscribeform.php rename to lib/profile/subscribeform.php index f10d884ed8..ad8ae985ea 100644 --- a/lib/subscribeform.php +++ b/lib/profile/subscribeform.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for subscribing to a user diff --git a/lib/subscribepeopletagform.php b/lib/profile/subscribepeopletagform.php similarity index 98% rename from lib/subscribepeopletagform.php rename to lib/profile/subscribepeopletagform.php index c570ff1cee..0bd04886f2 100644 --- a/lib/subscribepeopletagform.php +++ b/lib/profile/subscribepeopletagform.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for subscribing to a peopletag diff --git a/lib/subscriberslist.php b/lib/profile/subscriberslist.php similarity index 100% rename from lib/subscriberslist.php rename to lib/profile/subscriberslist.php diff --git a/lib/subscriberslistitem.php b/lib/profile/subscriberslistitem.php similarity index 100% rename from lib/subscriberslistitem.php rename to lib/profile/subscriberslistitem.php diff --git a/lib/subscribersminilist.php b/lib/profile/subscribersminilist.php similarity index 100% rename from lib/subscribersminilist.php rename to lib/profile/subscribersminilist.php diff --git a/lib/subscribersminilistitem.php b/lib/profile/subscribersminilistitem.php similarity index 100% rename from lib/subscribersminilistitem.php rename to lib/profile/subscribersminilistitem.php diff --git a/lib/subscriptionlist.php b/lib/profile/subscriptionlist.php similarity index 100% rename from lib/subscriptionlist.php rename to lib/profile/subscriptionlist.php diff --git a/lib/subscriptionlistitem.php b/lib/profile/subscriptionlistitem.php similarity index 100% rename from lib/subscriptionlistitem.php rename to lib/profile/subscriptionlistitem.php diff --git a/lib/subscriptionslist.php b/lib/profile/subscriptionslist.php similarity index 100% rename from lib/subscriptionslist.php rename to lib/profile/subscriptionslist.php diff --git a/lib/subscriptionslistitem.php b/lib/profile/subscriptionslistitem.php similarity index 100% rename from lib/subscriptionslistitem.php rename to lib/profile/subscriptionslistitem.php diff --git a/lib/tagprofileform.php b/lib/profile/tagprofileform.php similarity index 100% rename from lib/tagprofileform.php rename to lib/profile/tagprofileform.php diff --git a/lib/togglepeopletag.php b/lib/profile/togglepeopletag.php similarity index 99% rename from lib/togglepeopletag.php rename to lib/profile/togglepeopletag.php index fdbf2b7cdb..f8af36b15e 100644 --- a/lib/togglepeopletag.php +++ b/lib/profile/togglepeopletag.php @@ -30,7 +30,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for editing a peopletag diff --git a/lib/unblockform.php b/lib/profile/unblockform.php similarity index 100% rename from lib/unblockform.php rename to lib/profile/unblockform.php diff --git a/lib/unsubscribeform.php b/lib/profile/unsubscribeform.php similarity index 98% rename from lib/unsubscribeform.php rename to lib/profile/unsubscribeform.php index 3fa594b1b3..b058ad9f22 100644 --- a/lib/unsubscribeform.php +++ b/lib/profile/unsubscribeform.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for unsubscribing from a user diff --git a/lib/unsubscribepeopletagform.php b/lib/profile/unsubscribepeopletagform.php similarity index 98% rename from lib/unsubscribepeopletagform.php rename to lib/profile/unsubscribepeopletagform.php index dac90af77e..ebb092325b 100644 --- a/lib/unsubscribepeopletagform.php +++ b/lib/profile/unsubscribepeopletagform.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for unsubscribing to a peopletag diff --git a/lib/dbqueuemanager.php b/lib/queue/dbqueuemanager.php similarity index 100% rename from lib/dbqueuemanager.php rename to lib/queue/dbqueuemanager.php diff --git a/lib/liberalstomp.php b/lib/queue/liberalstomp.php similarity index 100% rename from lib/liberalstomp.php rename to lib/queue/liberalstomp.php diff --git a/lib/pingqueuehandler.php b/lib/queue/pingqueuehandler.php similarity index 100% rename from lib/pingqueuehandler.php rename to lib/queue/pingqueuehandler.php diff --git a/lib/pluginqueuehandler.php b/lib/queue/pluginqueuehandler.php similarity index 100% rename from lib/pluginqueuehandler.php rename to lib/queue/pluginqueuehandler.php diff --git a/lib/queuehandler.php b/lib/queue/queuehandler.php similarity index 100% rename from lib/queuehandler.php rename to lib/queue/queuehandler.php diff --git a/lib/queuemanager.php b/lib/queue/queuemanager.php similarity index 100% rename from lib/queuemanager.php rename to lib/queue/queuemanager.php diff --git a/lib/queuemonitor.php b/lib/queue/queuemonitor.php similarity index 100% rename from lib/queuemonitor.php rename to lib/queue/queuemonitor.php diff --git a/lib/smsqueuehandler.php b/lib/queue/smsqueuehandler.php similarity index 96% rename from lib/smsqueuehandler.php rename to lib/queue/smsqueuehandler.php index 007852c7f8..ab7c2ec4e8 100644 --- a/lib/smsqueuehandler.php +++ b/lib/queue/smsqueuehandler.php @@ -36,7 +36,7 @@ class SmsQueueHandler extends QueueHandler return true; } - require_once(INSTALLDIR.'/lib/mail.php'); + require_once(INSTALLDIR . '/lib/mail.php'); return mail_broadcast_notice_sms($notice); } } diff --git a/lib/stompqueuemanager.php b/lib/queue/stompqueuemanager.php similarity index 100% rename from lib/stompqueuemanager.php rename to lib/queue/stompqueuemanager.php diff --git a/lib/unqueuemanager.php b/lib/queue/unqueuemanager.php similarity index 100% rename from lib/unqueuemanager.php rename to lib/queue/unqueuemanager.php diff --git a/lib/search_engines.php b/lib/search/search_engines.php similarity index 100% rename from lib/search_engines.php rename to lib/search/search_engines.php diff --git a/lib/searchaction.php b/lib/search/searchaction.php similarity index 98% rename from lib/searchaction.php rename to lib/search/searchaction.php index 5ede78d414..f9433bf266 100644 --- a/lib/searchaction.php +++ b/lib/search/searchaction.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/searchgroupnav.php'; +require_once INSTALLDIR . '/lib/searchgroupnav.php'; /** * Base search action class. diff --git a/lib/searchform.php b/lib/search/searchform.php similarity index 100% rename from lib/searchform.php rename to lib/search/searchform.php diff --git a/lib/searchgroupnav.php b/lib/search/searchgroupnav.php similarity index 100% rename from lib/searchgroupnav.php rename to lib/search/searchgroupnav.php diff --git a/lib/searchnoticestream.php b/lib/search/searchnoticestream.php similarity index 100% rename from lib/searchnoticestream.php rename to lib/search/searchnoticestream.php diff --git a/lib/channel.php b/lib/ui/channel.php similarity index 100% rename from lib/channel.php rename to lib/ui/channel.php diff --git a/lib/clienterroraction.php b/lib/ui/clienterroraction.php similarity index 100% rename from lib/clienterroraction.php rename to lib/ui/clienterroraction.php diff --git a/lib/defaultlocalnav.php b/lib/ui/defaultlocalnav.php similarity index 100% rename from lib/defaultlocalnav.php rename to lib/ui/defaultlocalnav.php diff --git a/lib/featureduserssection.php b/lib/ui/featureduserssection.php similarity index 100% rename from lib/featureduserssection.php rename to lib/ui/featureduserssection.php diff --git a/lib/galleryaction.php b/lib/ui/galleryaction.php similarity index 100% rename from lib/galleryaction.php rename to lib/ui/galleryaction.php diff --git a/lib/homestubnav.php b/lib/ui/homestubnav.php similarity index 100% rename from lib/homestubnav.php rename to lib/ui/homestubnav.php diff --git a/lib/invitebuttonsection.php b/lib/ui/invitebuttonsection.php similarity index 100% rename from lib/invitebuttonsection.php rename to lib/ui/invitebuttonsection.php diff --git a/lib/inviteform.php b/lib/ui/inviteform.php similarity index 100% rename from lib/inviteform.php rename to lib/ui/inviteform.php diff --git a/lib/menu.php b/lib/ui/menu.php similarity index 100% rename from lib/menu.php rename to lib/ui/menu.php diff --git a/lib/moremenu.php b/lib/ui/moremenu.php similarity index 100% rename from lib/moremenu.php rename to lib/ui/moremenu.php diff --git a/lib/primarynav.php b/lib/ui/primarynav.php similarity index 100% rename from lib/primarynav.php rename to lib/ui/primarynav.php diff --git a/lib/secondarynav.php b/lib/ui/secondarynav.php similarity index 100% rename from lib/secondarynav.php rename to lib/ui/secondarynav.php diff --git a/lib/section.php b/lib/ui/section.php similarity index 100% rename from lib/section.php rename to lib/ui/section.php diff --git a/lib/sectionnoticelist.php b/lib/ui/sectionnoticelist.php similarity index 100% rename from lib/sectionnoticelist.php rename to lib/ui/sectionnoticelist.php diff --git a/lib/selftagswidget.php b/lib/ui/selftagswidget.php similarity index 100% rename from lib/selftagswidget.php rename to lib/ui/selftagswidget.php diff --git a/lib/settingsaction.php b/lib/ui/settingsaction.php similarity index 100% rename from lib/settingsaction.php rename to lib/ui/settingsaction.php diff --git a/lib/settingsnav.php b/lib/ui/settingsnav.php similarity index 100% rename from lib/settingsnav.php rename to lib/ui/settingsnav.php diff --git a/lib/siteprofile.php b/lib/ui/siteprofile.php similarity index 100% rename from lib/siteprofile.php rename to lib/ui/siteprofile.php diff --git a/lib/subgroupnav.php b/lib/ui/subgroupnav.php similarity index 99% rename from lib/subgroupnav.php rename to lib/ui/subgroupnav.php index 40447dd41a..83cfcd51eb 100644 --- a/lib/subgroupnav.php +++ b/lib/ui/subgroupnav.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/widget.php'; +require_once INSTALLDIR . '/lib/widget.php'; /** * Local nav menu for subscriptions, subscribers diff --git a/lib/theme.php b/lib/ui/theme.php similarity index 100% rename from lib/theme.php rename to lib/ui/theme.php diff --git a/lib/topposterssection.php b/lib/ui/topposterssection.php similarity index 100% rename from lib/topposterssection.php rename to lib/ui/topposterssection.php diff --git a/lib/toselector.php b/lib/ui/toselector.php similarity index 100% rename from lib/toselector.php rename to lib/ui/toselector.php diff --git a/lib/widget.php b/lib/ui/widget.php similarity index 100% rename from lib/widget.php rename to lib/ui/widget.php diff --git a/lib/arraywrapper.php b/lib/util/arraywrapper.php similarity index 100% rename from lib/arraywrapper.php rename to lib/util/arraywrapper.php diff --git a/lib/callableleftcurry.php b/lib/util/callableleftcurry.php similarity index 100% rename from lib/callableleftcurry.php rename to lib/util/callableleftcurry.php diff --git a/lib/command.php b/lib/util/command.php similarity index 99% rename from lib/command.php rename to lib/util/command.php index b91020be7b..3e07ff8e59 100644 --- a/lib/command.php +++ b/lib/util/command.php @@ -19,7 +19,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } -require_once(INSTALLDIR.'/lib/channel.php'); +require_once(INSTALLDIR . '/lib/util/channel.php'); class Command { diff --git a/lib/commandinterpreter.php b/lib/util/commandinterpreter.php similarity index 99% rename from lib/commandinterpreter.php rename to lib/util/commandinterpreter.php index c546cf0fca..42716930a3 100644 --- a/lib/commandinterpreter.php +++ b/lib/util/commandinterpreter.php @@ -19,7 +19,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/command.php'; +require_once INSTALLDIR . '/lib/command.php'; class CommandInterpreter { diff --git a/lib/common.php b/lib/util/common.php similarity index 100% rename from lib/common.php rename to lib/util/common.php diff --git a/lib/daemon.php b/lib/util/daemon.php similarity index 100% rename from lib/daemon.php rename to lib/util/daemon.php diff --git a/lib/default.php b/lib/util/default.php similarity index 100% rename from lib/default.php rename to lib/util/default.php diff --git a/lib/deletetree.php b/lib/util/deletetree.php similarity index 100% rename from lib/deletetree.php rename to lib/util/deletetree.php diff --git a/lib/docfile.php b/lib/util/docfile.php similarity index 100% rename from lib/docfile.php rename to lib/util/docfile.php diff --git a/lib/event.php b/lib/util/event.php similarity index 100% rename from lib/event.php rename to lib/util/event.php diff --git a/lib/form.php b/lib/util/form.php similarity index 99% rename from lib/form.php rename to lib/util/form.php index fcccb9c752..48c3712214 100644 --- a/lib/form.php +++ b/lib/util/form.php @@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/lib/widget.php'; +require_once INSTALLDIR . '/lib/widget.php'; /** * Base class for forms diff --git a/lib/formaction.php b/lib/util/formaction.php similarity index 100% rename from lib/formaction.php rename to lib/util/formaction.php diff --git a/lib/framework.php b/lib/util/framework.php similarity index 100% rename from lib/framework.php rename to lib/util/framework.php diff --git a/lib/gnusocial.php b/lib/util/gnusocial.php similarity index 100% rename from lib/gnusocial.php rename to lib/util/gnusocial.php diff --git a/lib/htmloutputter.php b/lib/util/htmloutputter.php similarity index 100% rename from lib/htmloutputter.php rename to lib/util/htmloutputter.php diff --git a/lib/httpclient.php b/lib/util/httpclient.php similarity index 100% rename from lib/httpclient.php rename to lib/util/httpclient.php diff --git a/lib/infoaction.php b/lib/util/infoaction.php similarity index 100% rename from lib/infoaction.php rename to lib/util/infoaction.php diff --git a/lib/installer.php b/lib/util/installer.php similarity index 100% rename from lib/installer.php rename to lib/util/installer.php diff --git a/lib/internalsessionhandler.php b/lib/util/internalsessionhandler.php similarity index 100% rename from lib/internalsessionhandler.php rename to lib/util/internalsessionhandler.php diff --git a/lib/iomanager.php b/lib/util/iomanager.php similarity index 100% rename from lib/iomanager.php rename to lib/util/iomanager.php diff --git a/lib/iomaster.php b/lib/util/iomaster.php similarity index 100% rename from lib/iomaster.php rename to lib/util/iomaster.php diff --git a/lib/language.php b/lib/util/language.php similarity index 100% rename from lib/language.php rename to lib/util/language.php diff --git a/lib/location.php b/lib/util/location.php similarity index 100% rename from lib/location.php rename to lib/util/location.php diff --git a/lib/mail.php b/lib/util/mail.php similarity index 100% rename from lib/mail.php rename to lib/util/mail.php diff --git a/lib/mailhandler.php b/lib/util/mailhandler.php similarity index 100% rename from lib/mailhandler.php rename to lib/util/mailhandler.php diff --git a/lib/managedaction.php b/lib/util/managedaction.php similarity index 100% rename from lib/managedaction.php rename to lib/util/managedaction.php diff --git a/lib/oauthclient.php b/lib/util/oauthclient.php similarity index 100% rename from lib/oauthclient.php rename to lib/util/oauthclient.php diff --git a/lib/parallelizingdaemon.php b/lib/util/parallelizingdaemon.php similarity index 100% rename from lib/parallelizingdaemon.php rename to lib/util/parallelizingdaemon.php diff --git a/lib/ping.php b/lib/util/ping.php similarity index 100% rename from lib/ping.php rename to lib/util/ping.php diff --git a/lib/processmanager.php b/lib/util/processmanager.php similarity index 100% rename from lib/processmanager.php rename to lib/util/processmanager.php diff --git a/lib/redirectingaction.php b/lib/util/redirectingaction.php similarity index 100% rename from lib/redirectingaction.php rename to lib/util/redirectingaction.php diff --git a/lib/right.php b/lib/util/right.php similarity index 100% rename from lib/right.php rename to lib/util/right.php diff --git a/lib/router.php b/lib/util/router.php similarity index 100% rename from lib/router.php rename to lib/util/router.php diff --git a/lib/spawningdaemon.php b/lib/util/spawningdaemon.php similarity index 100% rename from lib/spawningdaemon.php rename to lib/util/spawningdaemon.php diff --git a/lib/taguri.php b/lib/util/taguri.php similarity index 100% rename from lib/taguri.php rename to lib/util/taguri.php diff --git a/lib/themeuploader.php b/lib/util/themeuploader.php similarity index 100% rename from lib/themeuploader.php rename to lib/util/themeuploader.php diff --git a/lib/urlmapper.php b/lib/util/urlmapper.php similarity index 100% rename from lib/urlmapper.php rename to lib/util/urlmapper.php diff --git a/lib/util.php b/lib/util/util.php similarity index 100% rename from lib/util.php rename to lib/util/util.php diff --git a/lib/uuid.php b/lib/util/uuid.php similarity index 100% rename from lib/uuid.php rename to lib/util/uuid.php diff --git a/lib/webcolor.php b/lib/util/webcolor.php similarity index 100% rename from lib/webcolor.php rename to lib/util/webcolor.php diff --git a/lib/xmloutputter.php b/lib/util/xmloutputter.php similarity index 100% rename from lib/xmloutputter.php rename to lib/util/xmloutputter.php diff --git a/lib/xmlstringer.php b/lib/util/xmlstringer.php similarity index 100% rename from lib/xmlstringer.php rename to lib/util/xmlstringer.php diff --git a/modules/Favorite/FavoriteModule.php b/modules/Favorite/FavoriteModule.php index 9e716592ae..87fab6ee9a 100644 --- a/modules/Favorite/FavoriteModule.php +++ b/modules/Favorite/FavoriteModule.php @@ -602,7 +602,7 @@ function mail_notify_fave(User $rcpt, Profile $sender, Notice $notice) } // We need the global mail.php for various mail related functions below. - require_once INSTALLDIR.'/lib/mail.php'; + require_once INSTALLDIR . '/lib/mail.php'; $bestname = $sender->getBestName(); diff --git a/plugins/AnonymousFave/forms/anondisfavor.php b/plugins/AnonymousFave/forms/anondisfavor.php index 3d715f0807..0382a50f97 100644 --- a/plugins/AnonymousFave/forms/anondisfavor.php +++ b/plugins/AnonymousFave/forms/anondisfavor.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for disfavoring a notice anonymously diff --git a/plugins/AnonymousFave/forms/anonfavor.php b/plugins/AnonymousFave/forms/anonfavor.php index 491165aa1c..a33b375c15 100644 --- a/plugins/AnonymousFave/forms/anonfavor.php +++ b/plugins/AnonymousFave/forms/anonfavor.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for favoring a notice anonymously diff --git a/plugins/UserFlag/forms/clearflag.php b/plugins/UserFlag/forms/clearflag.php index 47dd3924c3..af72003762 100644 --- a/plugins/UserFlag/forms/clearflag.php +++ b/plugins/UserFlag/forms/clearflag.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for clearing profile flags diff --git a/plugins/UserFlag/forms/flagprofile.php b/plugins/UserFlag/forms/flagprofile.php index acb47629e2..df2face1de 100644 --- a/plugins/UserFlag/forms/flagprofile.php +++ b/plugins/UserFlag/forms/flagprofile.php @@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { exit(1); } -require_once INSTALLDIR.'/lib/form.php'; +require_once INSTALLDIR . '/lib/form.php'; /** * Form for flagging a profile diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php index 809e97038d..988778507d 100755 --- a/scripts/maildaemon.php +++ b/scripts/maildaemon.php @@ -28,7 +28,7 @@ as STDIN. END_OF_HELP; require_once INSTALLDIR.'/scripts/commandline.inc'; -require_once INSTALLDIR.'/lib/mailhandler.php'; +require_once INSTALLDIR . '/lib/mailhandler.php'; if (common_config('emailpost', 'enabled')) { $mh = new MailHandler(); diff --git a/scripts/queuedaemon.php b/scripts/queuedaemon.php index 6d7cfcf222..793b67f6c4 100755 --- a/scripts/queuedaemon.php +++ b/scripts/queuedaemon.php @@ -71,7 +71,7 @@ END_OF_QUEUE_HELP; require_once INSTALLDIR.'/scripts/commandline.inc'; -require_once(INSTALLDIR.'/lib/daemon.php'); +require_once(INSTALLDIR . '/lib/daemon.php'); require_once(INSTALLDIR.'/classes/Queue_item.php'); require_once(INSTALLDIR.'/classes/Notice.php');