[LIB_REFACTOR] Fix requires

This commit is contained in:
Miguel Dantas 2019-08-23 13:36:02 +01:00 committed by Diogo Peralta Cordeiro
parent 2ab2e22a36
commit ab3e8ce21d
105 changed files with 123 additions and 123 deletions

View File

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

View File

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

View File

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

View File

@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
exit(1); 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 * Returns the most recent notices (default 20) posted to the list specified by ID

View File

@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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 * List of featured users

View File

@ -31,8 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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 * List of group members

View File

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

View File

@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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. * Group search action class.

View File

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

View File

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

View File

@ -32,8 +32,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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. * People search action class.

View File

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

View File

@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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 * List of people tagged by the user with a tag

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -142,7 +142,7 @@ class Confirm_address extends Managed_DataObject
$args['sitename'], $args['sitename'],
$args['url']); $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()); return mail_to_user($this->getProfile()->getUser(), $subject, $body, $args['headers'], $this->getAddress());
} }

View File

@ -573,7 +573,7 @@ class Memcached_DataObject extends Safe_DataObject
function getSearchEngine($table) 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 (Event::handle('GetSearchEngine', array($this, $table, &$search_engine))) {
if ('mysql' === common_config('db', 'type')) { if ('mysql' === common_config('db', 'type')) {

View File

@ -1890,7 +1890,7 @@ class Notice extends Managed_DataObject
$recipientIds = $this->getReplies(); $recipientIds = $this->getReplies();
if (Event::handle('StartNotifyMentioned', array($this, &$recipientIds))) { if (Event::handle('StartNotifyMentioned', array($this, &$recipientIds))) {
require_once INSTALLDIR . '/lib/mail.php'; require_once INSTALLDIR . '/lib/util/mail.php';
foreach ($recipientIds as $recipientId) { foreach ($recipientIds as $recipientId) {
try { try {

View File

@ -872,7 +872,7 @@ class User extends Managed_DataObject
static function recoverPassword($nore) 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 will be used as a fallback if our user doesn't have a confirmed email
$confirm_email = null; $confirm_email = null;

View File

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

View File

@ -359,7 +359,7 @@ class UserActivityStream extends AtomUserNoticeFeed
function writeJSON($handle) function writeJSON($handle)
{ {
require_once INSTALLDIR . '/lib/activitystreamjsondocument.php'; require_once INSTALLDIR . '/lib/activitystreams/activitystreamjsondocument.php';
fwrite($handle, '{"items": ['); fwrite($handle, '{"items": [');
$this->renderEntries(Feed::JSON, $handle); $this->renderEntries(Feed::JSON, $handle);
fwrite($handle, ']}'); fwrite($handle, ']}');

View File

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

View File

@ -16,8 +16,8 @@
defined('STATUSNET') || die(); 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 * Plugin list

View File

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

View File

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

View File

@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/servererroraction.php'; require_once INSTALLDIR . '/lib/action/servererroraction.php';
/** /**
* Class for displaying DB Errors * Class for displaying DB Errors

View File

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

View File

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

View File

@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/widget.php'; require_once INSTALLDIR . '/lib/ui/widget.php';
/** /**
* Widget to show a list of groups * Widget to show a list of groups

View File

@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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 * Widget to show a list of groups, good for sidebar

View File

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

View File

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

View File

@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/widget.php'; require_once INSTALLDIR . '/lib/ui/widget.php';
/** /**
* Menu for login group of actions * Menu for login group of actions

View File

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

View File

@ -30,8 +30,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); 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 * Form for editing a peopletag

View File

@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/widget.php'; require_once INSTALLDIR . '/lib/ui/widget.php';
/** /**
* Base class for all actions * Base class for all actions

View File

@ -30,7 +30,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/widget.php'; require_once INSTALLDIR . '/lib/ui/widget.php';
/** /**
* Tabset for a group * Tabset for a group

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/widget.php'; require_once INSTALLDIR . '/lib/ui/widget.php';
/** /**
* Local nav menu for subscriptions, subscribers * Local nav menu for subscriptions, subscribers

View File

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

View File

@ -19,7 +19,7 @@
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
require_once INSTALLDIR . '/lib/command.php'; require_once INSTALLDIR . '/lib/util/command.php';
class CommandInterpreter class CommandInterpreter
{ {

View File

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

View File

@ -32,7 +32,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/widget.php'; require_once INSTALLDIR . '/lib/ui/widget.php';
/** /**
* Base class for forms * Base class for forms

View File

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

View File

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

View File

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

View File

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

View File

@ -1102,7 +1102,7 @@ function callback_helper($matches, $callback, $arg = null)
return substr($matches[0], 0, $left) . $result . substr($matches[0], $right); 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) function common_linkify($url)
{ {

View File

@ -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. // 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(); $bestname = $sender->getBestName();

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -2,7 +2,7 @@
if (!defined('GNUSOCIAL')) { exit(1); } 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 * This plugin lets you type @twitter.com/singpolyma

View File

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

View File

@ -9,7 +9,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
define('GNUSOCIAL', true); define('GNUSOCIAL', true);
define('STATUSNET', true); // compatibility 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'; require_once INSTALLDIR . '/plugins/OStatus/lib/feeddiscovery.php';
class FeedDiscoveryTest extends PHPUnit_Framework_TestCase class FeedDiscoveryTest extends PHPUnit_Framework_TestCase

View File

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

View File

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

View File

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

View File

@ -31,7 +31,7 @@
if (!defined('GNUSOCIAL')) { exit(1); } if (!defined('GNUSOCIAL')) { exit(1); }
require_once dirname(__DIR__) . '/twitter.php'; 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 * Class for doing OAuth authentication against Twitter

View File

@ -37,8 +37,8 @@ Batch script for retrieving Twitter messages from foreign service.
END_OF_TRIM_HELP; END_OF_TRIM_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc'; 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'; require_once dirname(__DIR__) . '/twitter.php';
/** /**

View File

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

View File

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

View File

@ -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."); 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. * Format a backtrace line for debug output roughly like debug_print_backtrace() does.

View File

@ -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'); set_error_handler('common_error_handler');

View File

@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
define('GNUSOCIAL', true); define('GNUSOCIAL', true);
define('STATUSNET', 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. // 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. // We'll wrap this whole mess in a Closure so it doesn't leak any globals.

View File

@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
define('GNUSOCIAL', true); define('GNUSOCIAL', true);
define('STATUSNET', true); // compatibility 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.'); common_log(LOG_INFO, 'Starting to do old notices.');

View File

@ -34,7 +34,7 @@ define('INSTALLDIR', dirname(__DIR__));
define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public'); define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
set_include_path(get_include_path() . PATH_SEPARATOR . INSTALLDIR . '/extlib'); 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'; require_once 'Console/Getopt.php';
class CliInstaller extends Installer class CliInstaller extends Installer

View File

@ -28,7 +28,7 @@ as STDIN.
END_OF_HELP; 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')) { if (common_config('emailpost', 'enabled')) {
$mh = new MailHandler(); $mh = new MailHandler();

View File

@ -71,7 +71,7 @@ END_OF_QUEUE_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; 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');

View File

@ -85,7 +85,7 @@ function mailConfirmAddress(Confirm_address $ca)
mail_confirm_address($user, $ca->code, $user->getNickname(), $ca->address); 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) { if (!$all) {
mailConfirmAddress($ca); mailConfirmAddress($ca);

View File

@ -29,7 +29,7 @@ define('PUBLICDIR', INSTALLDIR . DIRECTORY_SEPARATOR . 'public');
define('GNUSOCIAL', true); define('GNUSOCIAL', true);
define('STATUSNET', true); // compatibility 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) // Master StatusNet .pot file location (created by update_pot.sh)
$statusnet_pot = INSTALLDIR . '/locale/statusnet.pot'; $statusnet_pot = INSTALLDIR . '/locale/statusnet.pot';

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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