[LIB_REFACTOR] Fix requires

actions/addpeopletag.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/togglepeopletag.php';
+require_once INSTALLDIR . '/lib/account/togglepeopletag.php';
 
 /**
  *

actions/apilistmembers.php

@@ -30,7 +30,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apilistusers.php';
+require_once INSTALLDIR . '/lib/api/apilistusers.php';
 
 class ApiListMembersAction extends ApiListUsersAction
 {

actions/apilistsubscribers.php

@@ -29,7 +29,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/apilistusers.php';
+require_once INSTALLDIR . '/lib/api/apilistusers.php';
 
 class ApiListSubscribersAction extends ApiListUsersAction
 {

actions/apitimelinelist.php

@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/atomlistnoticefeed.php';
+require_once INSTALLDIR . '/lib/feeds/atomlistnoticefeed.php';
 
 /**
  * Returns the most recent notices (default 20) posted to the list specified by ID

actions/featured.php

@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/profilelist.php';
+require_once INSTALLDIR . '/lib/profile/profilelist.php';
-require_once INSTALLDIR . '/lib/publicgroupnav.php';
+require_once INSTALLDIR . '/lib/groups/publicgroupnav.php';
 
 /**
  * List of featured users

actions/groupqueue.php

@@ -31,8 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once(INSTALLDIR . '/lib/profilelist.php');
+require_once INSTALLDIR . '/lib/profile/profilelist.php';
-require_once INSTALLDIR . '/lib/publicgroupnav.php';
+require_once INSTALLDIR . '/lib/groups/publicgroupnav.php';
 
 /**
  * List of group members

actions/groups.php

@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/grouplist.php';
+require_once INSTALLDIR . '/lib/groups/grouplist.php';
 
 /**
  * Latest groups

actions/groupsearch.php

@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-//require_once INSTALLDIR.'/lib/searchaction.php';
+require_once INSTALLDIR . '/lib/search/searchaction.php';
-//require_once INSTALLDIR.'/lib/profilelist.php';
+require_once INSTALLDIR . '/lib/profile/profilelist.php';
 
 /**
  * Group search action class.

actions/noticesearch.php

@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/searchaction.php';
+require_once INSTALLDIR . '/lib/search/searchaction.php';
 
 /**
  * Notice search action class.

actions/nudge.php

@@ -33,7 +33,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/mail.php';
+require_once INSTALLDIR . '/lib/util/mail.php';
 
 /**
  * Nudge a user action class.

actions/peoplesearch.php

@@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/searchaction.php';
+require_once INSTALLDIR . '/lib/search/searchaction.php';
-require_once INSTALLDIR . '/lib/profilelist.php';
+require_once INSTALLDIR . '/lib/profile/profilelist.php';
 
 /**
  * People search action class.

actions/peopletag.php

@@ -35,7 +35,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/peopletaglist.php';
+require_once INSTALLDIR . '/lib/profile/peopletaglist.php';
 // cache 3 pages
 define('PEOPLETAG_CACHE_WINDOW', PEOPLETAGS_PER_PAGE*3 + 1);
 

actions/peopletagged.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once(INSTALLDIR . '/lib/profilelist.php');
+require_once INSTALLDIR . '/lib/profile/profilelist.php';
 
 /**
  * List of people tagged by the user with a tag

actions/peopletagsbyuser.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/peopletaglist.php';
+require_once INSTALLDIR . '/lib/profile/peopletaglist.php';
 
 class PeopletagsbyuserAction extends Action
 {

actions/peopletagsforuser.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/peopletaglist.php';
+require_once INSTALLDIR . '/lib/profile/peopletaglist.php';
 
 class PeopletagsforuserAction extends Action
 {

actions/peopletagsubscribers.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once(INSTALLDIR . '/lib/profilelist.php');
+require_once INSTALLDIR . '/lib/profile/profilelist.php';
 
 /**
  * List of peopletag subscribers

actions/peopletagsubscriptions.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/peopletaglist.php';
+require_once INSTALLDIR . '/lib/profile/peopletaglist.php';
 
 class PeopletagsubscriptionsAction extends Action
 {

actions/plugindelete.php

@@ -16,7 +16,7 @@
 
 defined('STATUSNET') || die();
 
-require_once INSTALLDIR . '/lib/deletetree.php';
+require_once INSTALLDIR . '/lib/util/deletetree.php';
 
 /**
  * Form for deleting a plugin

actions/plugininstall.php

@@ -16,7 +16,7 @@
 
 defined('STATUSNET') || die();
 
-require_once INSTALLDIR . '/lib/deletetree.php';
+require_once INSTALLDIR . '/lib/util/deletetree.php';
 
 /**
  * Plugin install action.

actions/profilecompletion.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/peopletageditform.php';
+require_once INSTALLDIR . '/lib/profile/peopletageditform.php';
 
 /**
  * Subscription action

actions/removepeopletag.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/togglepeopletag.php';
+require_once INSTALLDIR . '/lib/account/togglepeopletag.php';
 
 /**
  * Subscription action

actions/shownotice.php

@@ -31,7 +31,7 @@ if (!defined('GNUSOCIAL')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/noticelist.php';
+require_once INSTALLDIR . '/lib/notices/noticelist.php';
 
 /**
  * Show a single notice

actions/usergroups.php

@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/grouplist.php';
+require_once INSTALLDIR . '/lib/groups/grouplist.php';
 
 /**
  * User groups page

classes/Confirm_address.php

@@ -142,7 +142,7 @@ class Confirm_address extends Managed_DataObject
                         $args['sitename'],
                         $args['url']);
 
-        require_once(INSTALLDIR . '/lib/mail.php');
+        require_once INSTALLDIR . '/lib/util/mail.php';
         return mail_to_user($this->getProfile()->getUser(), $subject, $body, $args['headers'], $this->getAddress());
     }
 

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/search_engines.php';
 
         if (Event::handle('GetSearchEngine', array($this, $table, &$search_engine))) {
             if ('mysql' === common_config('db', 'type')) {

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/util/mail.php';
 
             foreach ($recipientIds as $recipientId) {
                 try {

classes/User.php

@@ -872,7 +872,7 @@ class User extends Managed_DataObject
 
     static function recoverPassword($nore)
     {
-        require_once(INSTALLDIR . '/lib/mail.php');
+        require_once INSTALLDIR . '/lib/util/mail.php';
 
         // $confirm_email will be used as a fallback if our user doesn't have a confirmed email
         $confirm_email = null;

lib/activitystreams/activityobject.php

@@ -32,7 +32,7 @@ if (!defined('GNUSOCIAL')) {
     exit(1);
 }
 
-require_once(INSTALLDIR . '/lib/activitystreamjsondocument.php');
+require_once INSTALLDIR . '/lib/activitystreams/activitystreamjsondocument.php';
 
 /**
  * A noun-ish thing in the activity universe

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/activitystreams/activitystreamjsondocument.php';
         fwrite($handle, '{"items": [');
         $this->renderEntries(Feed::JSON, $handle);
         fwrite($handle, ']}');

lib/admin/pluginenableform.php

@@ -16,7 +16,7 @@
 
 defined('STATUSNET') || die();
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for enabling a plugin

lib/admin/pluginlist.php

@@ -16,8 +16,8 @@
 
 defined('STATUSNET') || die();
 
-require INSTALLDIR . "/lib/pluginenableform.php";
+require INSTALLDIR . "/lib/admin/pluginenableform.php";
-require INSTALLDIR . "/lib/plugindisableform.php";
+require INSTALLDIR . "/lib/admin/plugindisableform.php";
 
 /**
  * Plugin list

lib/api/apioauthaction.php

@@ -30,7 +30,7 @@
 if (!defined('STATUSNET')) {
     exit(1);
 }
-require_once INSTALLDIR . '/lib/apiaction.php';
+require_once INSTALLDIR . '/lib/api/apiaction.php';
 
 /**
  * Base action for API OAuth enpoints. Clean up the

lib/application/applicationeditform.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for editing an application

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/action/servererroraction.php';
 
 /**
  * Class for displaying DB Errors

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/util/form.php';
 
 /**
  * Form for leaving a group

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/util/form.php';
 
 /**
  * Form for editing a group

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/ui/widget.php';
 
 /**
  * Widget to show a list of groups

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/groups/grouplist.php';
 
 /**
  * Widget to show a list of groups, good for sidebar

lib/notices/dofollowlistitem.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/noticelist.php';
+require_once INSTALLDIR . '/lib/notices/noticelist.php';
 
 /**
  * StatusNet, the distributed open-source microblogging tool

lib/profile/cancelsubscriptionform.php

@@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for unsubscribing from a user

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/ui/widget.php';
 
 /**
  * Menu for login group of actions

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/util/form.php';
 
 /**
  * Form for nudging a user

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/util/form.php';
-require_once INSTALLDIR . '/lib/togglepeopletag.php';
+require_once INSTALLDIR . '/lib/account/togglepeopletag.php';
 
 /**
  * Form for editing a peopletag

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/ui/widget.php';
 
 /**
  * Base class for all actions

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/ui/widget.php';
 
 /**
  * Tabset for a group

lib/profile/peopletagsection.php

@@ -30,7 +30,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/peopletaglist.php';
+require_once INSTALLDIR . '/lib/profile/peopletaglist.php';
 
 define('PEOPLETAGS_PER_SECTION', 6);
 

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/util/form.php';
 
 /**
  * Form for subscribing to a user

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/util/form.php';
 
 /**
  * Form for subscribing to a peopletag

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/util/form.php';
 
 /**
  * Form for editing a peopletag

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/util/form.php';
 
 /**
  * Form for unsubscribing from a user

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/util/form.php';
 
 /**
  * Form for unsubscribing to a peopletag

lib/queue/pingqueuehandler.php

@@ -36,7 +36,7 @@ class PingQueueHandler extends QueueHandler {
             return true;
         }
 
-        require_once INSTALLDIR . '/lib/ping.php';
+        require_once INSTALLDIR . '/lib/util/ping.php';
         return ping_broadcast_notice($notice);
     }
 }

lib/queue/smsqueuehandler.php

@@ -36,7 +36,7 @@ class SmsQueueHandler extends QueueHandler
             return true;
         }
 
-    	require_once(INSTALLDIR . '/lib/mail.php');
+        require_once INSTALLDIR . '/lib/util/mail.php';
         return mail_broadcast_notice_sms($notice);
     }
 }

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/search/searchgroupnav.php';
 
 /**
  * Base search action class.

lib/ui/inviteform.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for inviting collegues and friends

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/ui/widget.php';
 
 /**
  * Local nav menu for subscriptions, subscribers

lib/util/command.php

@@ -19,7 +19,7 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); }
 
-require_once(INSTALLDIR . '/lib/util/channel.php');
+require_once(INSTALLDIR . '/lib/ui/channel.php');
 
 class Command
 {

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/util/command.php';
 
 class CommandInterpreter
 {

lib/util/common.php

@@ -24,7 +24,7 @@ mb_internal_encoding('UTF-8');
 
 // All the fun stuff to actually initialize GNU social's framework code,
 // without loading up a site configuration.
-require_once INSTALLDIR . '/lib/framework.php';
+require_once INSTALLDIR . '/lib/util/framework.php';
 
 try {
     GNUsocial::init(@$server, @$path, @$conffile);

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/ui/widget.php';
 
 /**
  * Base class for forms

lib/util/framework.php

@@ -100,12 +100,12 @@ require_once 'DB/DataObject/Cast.php'; # for dates
 global $_DB;
 $_DB = new DB;
 
-require_once INSTALLDIR . '/lib/language.php';
+require_once INSTALLDIR . '/lib/util/language.php';
 
 // This gets included before the config file, so that admin code and plugins
 // can use it
 
-require_once INSTALLDIR . '/lib/event.php';
+require_once INSTALLDIR . '/lib/util/event.php';
 require_once INSTALLDIR . '/lib/modules/Module.php';
 require_once INSTALLDIR . '/lib/modules/Plugin.php';
 
@@ -163,9 +163,9 @@ spl_autoload_register(function ($class) {
         return;
     }
 });
-require_once INSTALLDIR . '/lib/util.php';
+require_once INSTALLDIR . '/lib/util/util.php';
-require_once INSTALLDIR . '/lib/action.php';
+require_once INSTALLDIR . '/lib/action/action.php';
-require_once INSTALLDIR . '/lib/mail.php';
+require_once INSTALLDIR . '/lib/util/mail.php';
 
 //set PEAR error handling to use regular PHP exceptions
 function PEAR_ErrorToPEAR_Exception(PEAR_Error $err)

lib/util/gnusocial.php

@@ -352,7 +352,7 @@ class GNUsocial
     protected static function defaultConfig()
     {
         global $_server, $_path;
-        require(INSTALLDIR . '/lib/default.php');
+        require(INSTALLDIR . '/lib/util/default.php');
         return $default;
     }
 

lib/util/installer.php

@@ -152,11 +152,11 @@ abstract class Installer
         if (!$this->skipConfig) {
             define('GNUSOCIAL', true);
             define('STATUSNET', true);
-            require_once INSTALLDIR . '/lib/language.php';
+            require_once INSTALLDIR . '/lib/util/language.php';
             $_server = $this->server;
             $_path = $this->path; // We won't be using those so it's safe to do this small hack
-            require_once INSTALLDIR . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'util.php';
+            require_once INSTALLDIR . '/lib/util/util.php';
-            require_once INSTALLDIR . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'default.php';
+            require_once INSTALLDIR . '/lib/util/default.php';
             $fileSubdirs = [
                 empty($this->avatarDir) ? $default['avatar']['dir'] : $this->avatarDir,
                 empty($this->fileDir) ? $default['attachments']['dir'] : $this->fileDir
@@ -535,7 +535,7 @@ abstract class Installer
         // initalize hostname from install arguments, so it can be used to find
         // the /etc config file from the commandline installer
         $server = $this->server;
-        require_once INSTALLDIR . '/lib/common.php';
+        require_once INSTALLDIR . '/lib/util/common.php';
 
         $data = ['nickname' => $this->adminNick,
             'password' => $this->adminPass,
@@ -580,7 +580,7 @@ abstract class Installer
             define('STATUSNET', true);
         }
 
-        require_once INSTALLDIR . '/lib/framework.php';
+        require_once INSTALLDIR . '/lib/util/framework.php';
         GNUsocial::initDefaults($this->server, $this->path);
 
         if ($this->siteProfile == "singleuser") {

lib/util/mailhandler.php

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once(INSTALLDIR . '/lib/mail.php');
+require_once INSTALLDIR . '/lib/util/mail.php';
 require_once('Mail/mimeDecode.php');
 
 // @todo FIXME: we use both Mail_mimeDecode and mailparse

lib/util/util.php

@@ -1102,7 +1102,7 @@ function callback_helper($matches, $callback, $arg = null)
     return substr($matches[0], 0, $left) . $result . substr($matches[0], $right);
 }
 
-require_once INSTALLDIR . "/lib/callableleftcurry.php";
+require_once INSTALLDIR . '/lib/util/callableleftcurry.php';
 
 function common_linkify($url)
 {

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/util/mail.php';
 
     $bestname = $sender->getBestName();
 

plugins/ActivitySpam/actions/spam.php

@@ -34,7 +34,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/noticelist.php';
+require_once INSTALLDIR . '/lib/notices/noticelist.php';
 
 /**
  * SpamAction

plugins/AnonymousFave/forms/anondisfavor.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for disfavoring a notice anonymously

plugins/AnonymousFave/forms/anonfavor.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for favoring a notice anonymously

plugins/DomainWhitelist/forms/whitelistinvite.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for inviting collegues and friends

plugins/Embed/tests/EmbedTest.php

@@ -34,7 +34,7 @@ if (!defined('GNUSOCIAL')) {
 if (!defined('STATUSNET')) { // Compatibility
     define('STATUSNET', true);
 }
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 final class oEmbedTest extends TestCase
 {

plugins/Linkback/LinkbackPlugin.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once(__DIR__ . '/lib/util.php');
+require_once __DIR__ . '/lib/util/util.php';
 
 define('LINKBACKPLUGIN_VERSION', '0.2');
 

plugins/MentionURL/MentionURLPlugin.php

@@ -2,7 +2,7 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); }
 
-require_once __DIR__ . '/lib/util.php';
+require_once __DIR__ . '/lib/util/util.php';
 
 /*
  * This plugin lets you type @twitter.com/singpolyma

plugins/OStatus/actions/ostatuspeopletag.php

@@ -24,7 +24,7 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-require_once INSTALLDIR . '/lib/peopletaglist.php';
+require_once INSTALLDIR . '/lib/profile/peopletaglist.php';
 
 /**
  * Key UI methods:

plugins/OStatus/tests/FeedDiscoveryTest.php

@@ -9,7 +9,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 require_once INSTALLDIR . '/plugins/OStatus/lib/feeddiscovery.php';
 
 class FeedDiscoveryTest extends PHPUnit_Framework_TestCase

plugins/OStatus/tests/MagicEnvelopeTest.php

@@ -9,7 +9,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 class MagicEnvelopeTest extends PHPUnit_Framework_TestCase
 {

plugins/QnA/forms/qnashowanswer.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for showing / revising an answer

plugins/QnA/forms/qnashowquestion.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for showing a question

plugins/TwitterBridge/actions/twitterauthorization.php

@@ -31,7 +31,7 @@
 if (!defined('GNUSOCIAL')) { exit(1); }
 
 require_once dirname(__DIR__) . '/twitter.php';
-require_once INSTALLDIR . '/lib/oauthclient.php';
+require_once INSTALLDIR . '/lib/util/oauthclient.php';
 
 /**
  * Class for doing OAuth authentication against Twitter

plugins/TwitterBridge/daemons/twitterstatusfetcher.php

@@ -37,8 +37,8 @@ Batch script for retrieving Twitter messages from foreign service.
 END_OF_TRIM_HELP;
 
 require_once INSTALLDIR . '/scripts/commandline.inc';
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
-require_once INSTALLDIR . '/lib/daemon.php';
+require_once INSTALLDIR . '/lib/util/daemon.php';
 require_once dirname(__DIR__) . '/twitter.php';
 
 /**

plugins/UserFlag/forms/clearflag.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for clearing profile flags

plugins/UserFlag/forms/flagprofile.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/form.php';
+require_once INSTALLDIR . '/lib/util/form.php';
 
 /**
  * Form for flagging a profile

public/index.php

@@ -168,7 +168,7 @@ if (preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']) === preg_replace("/^\/$
     die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
 }
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 /**
  * Format a backtrace line for debug output roughly like debug_print_backtrace() does.

scripts/commandline.inc

@@ -120,7 +120,7 @@ foreach ($options as $option) {
     }
 }
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 set_error_handler('common_error_handler');
 

scripts/console.php

@@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 define('GNUSOCIAL', true);
 define('STATUSNET', true);
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 // Try to find an autoloader for a local psysh version.
 // We'll wrap this whole mess in a Closure so it doesn't leak any globals.

scripts/fixup_hashtags.php

@@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 
-require_once(INSTALLDIR . '/lib/common.php');
+require_once INSTALLDIR . '/lib/util/common.php';
 
 common_log(LOG_INFO, 'Starting to do old notices.');
 

scripts/install_cli.php

@@ -34,7 +34,7 @@ define('INSTALLDIR', dirname(__DIR__));
 define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib');
 
-require_once INSTALLDIR . '/lib/installer.php';
+require_once INSTALLDIR . '/lib/util/installer.php';
 require_once 'Console/Getopt.php';
 
 class CliInstaller extends Installer

scripts/maildaemon.php

@@ -27,8 +27,8 @@ as STDIN.
 
 END_OF_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR . '/scripts/commandline.inc';
-require_once INSTALLDIR . '/lib/mailhandler.php';
+require_once INSTALLDIR . '/lib/util/mailhandler.php';
 
 if (common_config('emailpost', 'enabled')) {
     $mh = new MailHandler();

scripts/queuedaemon.php

@@ -71,9 +71,9 @@ END_OF_QUEUE_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-require_once(INSTALLDIR . '/lib/daemon.php');
+require_once INSTALLDIR . '/lib/util/daemon.php';
-require_once(INSTALLDIR.'/classes/Queue_item.php');
+require_once(INSTALLDIR . '/classes/Queue_item.php');
-require_once(INSTALLDIR.'/classes/Notice.php');
+require_once(INSTALLDIR . '/classes/Notice.php');
 
 /**
  * Queue handling daemon...

scripts/resend_confirm_address.php

@@ -85,7 +85,7 @@ function mailConfirmAddress(Confirm_address $ca)
     mail_confirm_address($user, $ca->code, $user->getNickname(), $ca->address);
 }
 
-require_once(INSTALLDIR . '/lib/mail.php');
+require_once INSTALLDIR . '/lib/util/mail.php';
 
 if (!$all) {
     mailConfirmAddress($ca);

scripts/update_translations.php

@@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
 define('GNUSOCIAL', true);
 define('STATUSNET', true);  // compatibility
 
-require_once(INSTALLDIR . '/lib/common.php');
+require_once INSTALLDIR . '/lib/util/common.php';
 
 // Master StatusNet .pot file location (created by update_pot.sh)
 $statusnet_pot = INSTALLDIR . '/locale/statusnet.pot';

tests/Core/ActivityGenerationTests.php

@@ -41,7 +41,7 @@ use PHPUnit\Framework\TestCase;
 use User;
 use User_group;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 final class ActivityGenerationTests extends TestCase
 {

tests/Core/ActivityParseTests.php

@@ -36,7 +36,7 @@ use ActivityVerb;
 use DOMDocument;
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 final class ActivityParseTests extends TestCase
 {

tests/Core/CallableLeftCurryTest.php

@@ -25,7 +25,7 @@ if (!defined('GNUSOCIAL')) {
 
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . "/lib/callableleftcurry.php";
+require_once INSTALLDIR . '/lib/util/callableleftcurry.php';
 
 final class CallableLeftCurryTest extends TestCase
 {

tests/Core/CommandInterperterTest.php

@@ -32,7 +32,7 @@ if (!defined('STATUSNET')) { // Compatibility
 use CommandInterpreter;
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 final class CommandInterpreterTest extends TestCase
 {

tests/Core/HashTagDetectionTests.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { // Compatibility
 
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 final class HashTagDetectionTests extends TestCase
 {

tests/Core/LocationTest.php

@@ -33,7 +33,7 @@ use GeonamesPlugin;
 use Location;
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 // Make sure this is loaded
 // XXX: how to test other plugins...?

tests/Core/NicknameTest.php

@@ -39,7 +39,7 @@ use NicknameTakenException;
 use NicknameTooLongException;
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 /**
  * Test cases for nickname validity and normalization.

tests/Core/TagURITest.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { // Compatibility
 
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 $config['site']['server'] = 'example.net';
 $config['site']['path'] = '/apps/statusnet';

tests/Core/URLDetectionTest.php

@@ -31,7 +31,7 @@ if (!defined('STATUSNET')) { // Compatibility
 
 use PHPUnit\Framework\TestCase;
 
-require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/util/common.php';
 
 final class URLDetectionTest extends TestCase
 {