$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
\Friendica\BaseObject::setDependencyInjection($dice);
-$a = \Friendica\BaseObject::getApp();
+$a = \Friendica\DI::app();
if ($a->getMode()->isInstall()) {
die("Friendica isn't properly installed yet.\n");
$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]);
BaseObject::setDependencyInjection($dice);
-$a = BaseObject::getApp();
+$a = Friendica\DI::app();
// Check the database structure and possibly fixes it
Update::check($a->getBasePath(), true, $a->getMode());
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
-use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Term;
use Friendica\Util\BasePath;
* Useful in functions which require it but don't get it passed to them
*
* @deprecated since version 2018.09
- * @see BaseObject::getApp()
+ * @see DI::app()
* @return App
*/
function get_app()
{
- return BaseObject::getApp();
+ return DI::app();
}
/**
*/
function api_users_show($type)
{
- $a = BaseObject::getApp();
+ $a = Friendica\DI::app();
$user_info = api_get_user($a);
*/
function api_format_items($items, $user_info, $filter_user = false, $type = "json")
{
- $a = BaseObject::getApp();
+ $a = Friendica\DI::app();
$ret = [];
*/
function api_format_item($item, $type = "json", $status_user = null, $author_user = null, $owner_user = null)
{
- $a = BaseObject::getApp();
+ $a = Friendica\DI::app();
if (empty($status_user) || empty($author_user) || empty($owner_user)) {
list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
function drop_item($id, $return = '')
{
- $a = BaseObject::getApp();
+ $a = Friendica\DI::app();
// locate item to be deleted
\Friendica\BaseObject::setDependencyInjection($dice);
-$a = \Friendica\BaseObject::getApp();
+$a = \Friendica\DI::app();
$a->runFrontend(
$dice->create(\Friendica\App\Module::class),
public static function setDependencyInjection(Dice $dice)
{
self::$dice = $dice;
- }
-
- /**
- * Get the app
- *
- * Same as get_app from boot.php
- *
- * @return App
- */
- public static function getApp()
- {
- return self::getClass(App::class);
+ DI::init($dice);
}
/**
protected function doExecute()
{
- $a = \Friendica\BaseObject::getApp();
+ $a = \Friendica\DI::app();
if ($this->getOption($this->helpOptions)) {
$this->out($this->getHelp());
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Event;
use Friendica\Model\Photo;
$text = Cache::get($cache_key);
if (is_null($text)) {
- $a = self::getApp();
+ $a = DI::app();
$stamp1 = microtime(true);
private static function cleanPictureLinksCallback($match)
{
- $a = self::getApp();
+ $a = DI::app();
// When the picture link is the own photo path then we can avoid fetching the link
$own_photo_url = preg_quote(Strings::normaliseLink($a->getBaseURL()) . '/photos/');
*/
public static function convert($text, $try_oembed = true, $simple_html = 0, $for_plaintext = false)
{
- $a = self::getApp();
+ $a = DI::app();
/*
* preg_match_callback function to replace potential Oembed tags with Oembed content
*/
public static function toMarkdown($text, $for_diaspora = true)
{
- $a = self::getApp();
+ $a = DI::app();
$original_text = $text;
use Friendica\BaseObject;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Contact;
/**
$html = $MarkdownParser->transform($text);
- self::getApp()->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());
+ DI::app()->getProfiler()->saveTimestamp($stamp1, "parser", System::callstack());
return $html;
}
use Friendica\App\Page;
use Friendica\BaseObject;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
*/
public static function getSuggestContactSelectHTML($selname, $selclass, array $options = [], array $preselected = [])
{
- $a = self::getApp();
+ $a = DI::app();
$networks = null;
*/
public static function getMessageContactSelectHTML($selname, $selclass, array $preselected = [], $size = 4, $tabindex = null)
{
- $a = self::getApp();
+ $a = DI::app();
$o = '';
use Friendica\BaseObject;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Util\Strings;
/**
@include_once('addon/' . $addon . '/' . $addon . '.php');
if (function_exists($addon . '_install')) {
$func = $addon . '_install';
- $func(self::getApp());
+ $func(DI::app());
$addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
if (function_exists($addon . '_uninstall')) {
$func = $addon . '_uninstall';
- $func(self::getApp());
+ $func(DI::app());
}
if (function_exists($addon . '_install')) {
$func = $addon . '_install';
- $func(self::getApp());
+ $func(DI::app());
}
DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
}
*/
public static function getInfo($addon)
{
- $a = self::getApp();
+ $a = DI::app();
$addon = Strings::sanitizeFilePathItem($addon);
use Friendica\App;
use Friendica\BaseObject;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Util\Strings;
/**
*/
public static function register($hook, $file, $function, $priority = 0)
{
- $file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
+ $file = str_replace(DI::app()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
if (DBA::exists('hook', $condition)) {
*/
public static function unregister($hook, $file, $function)
{
- $relative_file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
+ $relative_file = str_replace(DI::app()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
// This here is only needed for fixing a problem that existed on the develop branch
$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
if ($hook[0] != $fork_hook[0]) {
continue;
}
- self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
+ self::callSingle(DI::app(), 'hook_fork', $fork_hook, $hookdata);
}
if (!$hookdata['execute']) {
{
if (array_key_exists($name, self::$hooks)) {
foreach (self::$hooks[$name] as $hook) {
- self::callSingle(self::getApp(), $name, $hook, $data);
+ self::callSingle(DI::app(), $name, $hook, $data);
}
}
}
use Exception;
use Friendica\BaseObject;
+use Friendica\DI;
use Friendica\Render\FriendicaSmarty;
use Friendica\Render\ITemplateEngine;
public static function replaceMacros($s, array $vars = [])
{
$stamp1 = microtime(true);
- $a = self::getApp();
+ $a = DI::app();
// pass $baseurl to all templates if it isn't set
$vars = array_merge(['$baseurl' => $a->getBaseURL()], $vars);
public static function getMarkupTemplate($s, $root = '')
{
$stamp1 = microtime(true);
- $a = self::getApp();
+ $a = DI::app();
$t = self::getTemplateEngine();
try {
use Friendica\BaseObject;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Network\HTTPException;
*/
public static function getContactsFromGlobalDirectory($search, $type = self::TYPE_ALL, $page = 1)
{
- $config = self::getApp()->getConfig();
+ $config = DI::app()->getConfig();
$server = $config->get('system', 'directory', self::DEFAULT_DIRECTORY);
$searchUrl = $server . '/search';
*/
public static function getContactsFromLocalDirectory($search, $type = self::TYPE_ALL, $start = 0, $itemPage = 80)
{
- $config = self::getApp()->getConfig();
+ $config = DI::app()->getConfig();
$diaspora = $config->get('system', 'diaspora_enabled') ? Protocol::DIASPORA : Protocol::DFRN;
$ostatus = !$config->get('system', 'ostatus_disabled') ? Protocol::OSTATUS : Protocol::DFRN;
use Friendica\App\BaseURL;
use Friendica\BaseObject;
+use Friendica\DI;
use Friendica\Network\HTTPException\InternalServerErrorException;
use Friendica\Util\XML;
*/
public static function removedBaseUrl(string $orig_url)
{
- return self::getApp()->removeBaseURL($orig_url);
+ return DI::app()->removeBaseURL($orig_url);
}
/**
if (is_bool($prefix) && !$prefix) {
$prefix = '';
} elseif (empty($prefix)) {
- $prefix = hash('crc32', self::getApp()->getHostName());
+ $prefix = hash('crc32', DI::app()->getHostName());
}
while (strlen($prefix) < ($size - 13)) {
namespace Friendica\Core;
use Friendica\BaseObject;
+use Friendica\DI;
use Friendica\Model\Profile;
use Friendica\Util\Strings;
*/
public static function getPathForFile($file)
{
- $a = BaseObject::getApp();
+ $a = DI::app();
$theme = $a->getCurrentTheme();
return 'view/theme/' . $theme . '/style.css';
}
- $a = BaseObject::getApp();
+ $a = DI::app();
$query_params = [];
use Friendica\BaseObject;
use Friendica\Core;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Process;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
*/
public static function defer()
{
- if (empty(BaseObject::getApp()->queue)) {
+ if (empty(DI::app()->queue)) {
return false;
}
- $queue = BaseObject::getApp()->queue;
+ $queue = DI::app()->queue;
$retrial = $queue['retrial'];
$id = $queue['id'];
--- /dev/null
+<?php
+
+namespace Friendica;
+
+use Dice\Dice;
+
+/**
+ * This class is capable of getting all dynamic created classes
+ *
+ * There has to be a "method" phpDoc for each new class, containing result class for a proper matching
+ *
+ * @method static App app()
+ */
+class DI
+{
+ /** @var Dice */
+ private static $dice;
+
+ public static function init(Dice $dice)
+ {
+ self::$dice = $dice;
+ }
+
+ public static function __callStatic($name, $arguments)
+ {
+ switch ($name) {
+ case 'app':
+ return self::$dice->create(App::class, $arguments);
+ default:
+ return null;
+ }
+ }
+}
$function_name = static::$moduleName . '_' . $function_suffix;
if (\function_exists($function_name)) {
- $a = self::getApp();
+ $a = DI::app();
return $function_name($a);
} else {
return parent::{$function_suffix}($parameters);
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\DI;
use Friendica\Model\Storage\IStorage;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
*/
private static function getFields()
{
- $allfields = DBStructure::definition(self::getApp()->getBasePath(), false);
+ $allfields = DBStructure::definition(DI::app()->getBasePath(), false);
$fields = array_keys($allfields['attach']['fields']);
array_splice($fields, array_search('data', $fields), 1);
return $fields;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\Activity;
*/
public static function getPostsFromUrl($contact_url, $thread_mode = false, $update = 0)
{
- $a = self::getApp();
+ $a = DI::app();
$cid = self::getIdForURL($contact_url);
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
$guid = System::createUUID();
}
- return self::getApp()->getBaseURL() . '/objects/' . $guid;
+ return DI::app()->getBaseURL() . '/objects/' . $guid;
}
/**
*/
private static function addRedirToImageTags(array &$item)
{
- $app = self::getApp();
+ $app = DI::app();
$matches = [];
$cnt = preg_match_all('|\[img\](http[^\[]*?/photo/[a-fA-F0-9]+?(-[0-9]\.[\w]+?)?)\[\/img\]|', $item['body'], $matches, PREG_SET_ORDER);
*/
public static function prepareBody(array &$item, $attach = false, $is_preview = false)
{
- $a = self::getApp();
+ $a = DI::app();
Hook::callAll('prepare_body_init', $item);
// In order to provide theme developers more possibilities, event items
*/
public static function getPlink($item)
{
- $a = self::getApp();
+ $a = DI::app();
if ($a->user['nickname'] != "") {
$ret = [
use Friendica\BaseObject;
use Friendica\Core\Addon;
use Friendica\Database\DBA;
+use Friendica\DI;
/**
* Model interaction for the nodeinfo
*/
public static function update()
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
$logger = $app->getLogger();
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\Database;
+use Friendica\DI;
use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Proxy as ProxyUtils;
$ident = self::PERSONAL;
$notifies = [];
- $myurl = str_replace('http://', '', self::getApp()->contact['nurl']);
+ $myurl = str_replace('http://', '', DI::app()->contact['nurl']);
$diasp_url = str_replace('/profile/', '/u/', $myurl);
$condition = ["NOT `wall` AND `uid` = ? AND (`item`.`author-id` = ? OR `item`.`tag` REGEXP ? OR `item`.`tag` REGEXP ?)",
// We have to distinguish between these two because they use different data.
// Contact suggestions
if ($intro['fid']) {
- $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' .
+ $return_addr = bin2hex(DI::app()->user['nickname'] . '@' .
$this->baseUrl->getHostName() .
(($this->baseUrl->getURLPath()) ? '/' . $this->baseUrl->getURLPath() : ''));
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\DI;
use Friendica\Model\Storage\IStorage;
use Friendica\Object\Image;
use Friendica\Util\DateTimeFormat;
*/
private static function getFields()
{
- $allfields = DBStructure::definition(self::getApp()->getBasePath(), false);
+ $allfields = DBStructure::definition(DI::app()->getBasePath(), false);
$fields = array_keys($allfields["photo"]["fields"]);
array_splice($fields, array_search("data", $fields), 1);
return $fields;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
{
parent::post($parameters);
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$addons_admin = Addon::getAdminList();
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Index extends BaseAdminModule
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
// reload active themes
if (!empty($_GET['action'])) {
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Model;
notice(L10n::tt('%s contact unblocked', '%s contacts unblocked', count($contacts)));
}
- self::getApp()->internalRedirect('admin/blocklist/contact');
+ DI::app()->internalRedirect('admin/blocklist/contact');
}
public static function content(array $parameters = [])
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$condition = ['uid' => 0, 'blocked' => true];
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
info(L10n::t('Site blocklist updated.') . EOL);
}
- self::getApp()->internalRedirect('admin/blocklist/server');
+ DI::app()->internalRedirect('admin/blocklist/server');
}
public static function content(array $parameters = [])
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$blocklist = Config::get('system', 'blocklist');
$blocklistform = [];
use Friendica\Core\Update;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class DBSync extends BaseAdminModule
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$o = '';
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Features extends BaseAdminModule
}
}
- self::getApp()->internalRedirect('admin/features');
+ DI::app()->internalRedirect('admin/features');
}
public static function content(array $parameters = [])
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
}
info(L10n::t('Item marked for deletion.') . EOL);
- self::getApp()->internalRedirect('admin/item/delete');
+ DI::app()->internalRedirect('admin/item/delete');
}
public static function content(array $parameters = [])
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Module\BaseAdminModule;
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$guid = null;
// @TODO: Replace with parameter from router
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
use Psr\Log\LogLevel;
}
info(L10n::t("Log settings updated."));
- self::getApp()->internalRedirect('admin/logs');
+ DI::app()->internalRedirect('admin/logs');
}
public static function content(array $parameters = [])
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$log_choices = [
LogLevel::ERROR => 'Error',
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Arrays;
use Friendica\Util\DateTimeFormat;
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
$deferred = $a->argc > 2 && $a->argv[2] == 'deferred';
use Friendica\Core\Theme;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Module\Register;
use Friendica\Protocol\PortableContact;
self::checkFormSecurityTokenRedirectOnError('/admin/site', 'admin_site');
- $a = self::getApp();
+ $a = DI::app();
if (!empty($_POST['republish_directory'])) {
Worker::add(PRIORITY_LOW, 'Directory');
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
/* Installed langs */
$lang_choices = L10n::getAvailableLanguages();
use Friendica\Core\Update;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\DI;
use Friendica\Model\Register;
use Friendica\Module\BaseAdminModule;
use Friendica\Network\HTTPException\InternalServerErrorException;
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
// are there MyISAM tables in the DB? If so, trigger a warning message
$warningtext = [];
private static function checkSelfHostMeta()
{
// Fetch the host-meta to check if this really is a vital server
- return Network::curl(self::getApp()->getBaseURL() . '/.well-known/host-meta')->isSuccess();
+ return Network::curl(DI::app()->getBaseURL() . '/.well-known/host-meta')->isSuccess();
}
}
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
{
parent::post($parameters);
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
{
public static function init(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
{
parent::post($parameters);
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 2) {
// @TODO: Replace with parameter from router
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Theme;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
use Friendica\Util\Strings;
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
$allowed_themes = Theme::getAllowedList();
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\BaseAdminModule;
class Tos extends BaseAdminModule
info(L10n::t('The Terms of Service settings have been updated.'));
- self::getApp()->internalRedirect('admin/tos');
+ DI::app()->internalRedirect('admin/tos');
}
public static function content(array $parameters = [])
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Register;
use Friendica\Model\User;
use Friendica\Module\BaseAdminModule;
{
parent::post($parameters);
- $a = self::getApp();
+ $a = DI::app();
$pending = $_POST['pending'] ?? [];
$users = $_POST['user'] ?? [];
{
parent::content($parameters);
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc > 3) {
// @TODO: Replace with parameter from router
use Friendica\Content\Pager;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Network\HTTPException;
use Friendica\Util\Proxy as ProxyUtils;
{
public static function content(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
if (!local_user()) {
throw new HTTPException\ForbiddenException();
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
/**
* Shows the App menu
{
$privateaddons = Config::get('config', 'private_addons');
if ($privateaddons === "1" && !local_user()) {
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
}
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Attach as MAttach;
/**
*/
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc != 2) {
throw new \Friendica\Network\HTTPException\BadRequestException();
}
use Friendica\App\Arguments;
use Friendica\BaseModule;
use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Network\HTTPException;
require_once __DIR__ . '/../../../include/api.php';
throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.'));
}
- $a = self::getApp();
+ $a = DI::app();
if (!empty($a->user['uid']) && $a->user['uid'] != api_user()) {
throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
*/
protected static function login()
{
- api_login(self::getApp());
+ api_login(DI::app());
self::$current_user_id = api_user();
*/
protected static function getUser($contact_id = null)
{
- return api_get_user(self::getApp(), $contact_id);
+ return api_get_user(DI::app(), $contact_id);
}
protected static function format($root_element, $data)
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
+use Friendica\DI;
use Friendica\Network\HTTPException\ForbiddenException;
require_once 'boot.php';
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (!is_site_admin()) {
notice(L10n::t('Please login to continue.'));
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Network\HTTPException;
use Friendica\Object\Search\ContactResult;
*/
public static function performContactSearch($search, $prefix = '')
{
- $a = self::getApp();
+ $a = DI::app();
$config = $a->getConfig();
$type = Search::TYPE_ALL;
return '';
}
- $a = self::getApp();
+ $a = DI::app();
$id = 0;
$entries = [];
use Friendica\Content\Feature;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
class BaseSettingsModule extends BaseModule
{
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$tpl = Renderer::getMarkupTemplate('settings/head.tpl');
$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
use Friendica\BaseModule;
use Friendica\Core\ACL;
use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
{
$_GET['mode'] = 'minimal';
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
if (!local_user()) {
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Module\Security\Login;
use Friendica\Network\HTTPException\BadRequestException;
public static function post(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (!local_user()) {
return;
return Login::form($_SERVER['REQUEST_URI']);
}
- $a = self::getApp();
+ $a = DI::app();
$nets = $_GET['nets'] ?? '';
$rel = $_GET['rel'] ?? '';
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Protocol;
use Friendica\Util\Network;
{
if (!local_user()) {
info(L10n::t('You must be logged in to use this module'));
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
}
use Friendica\BaseModule;
use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Network\HTTPException;
throw new HTTPException\UnauthorizedException(L10n::t('Access denied.'));
}
- $app = self::getApp();
+ $app = DI::app();
// @TODO: Replace with parameter from router
$itemId = (($app->argc > 1) ? intval($app->argv[1]) : 0);
use Friendica\BaseModule;
use Friendica\Core\Installer;
use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
$bd_format = L10n::t('l F d, Y \@ g:i A');
if (!empty($_POST['timezone'])) {
- self::getApp()->data['mod-localtime'] = DateTimeFormat::convert($time, $_POST['timezone'], 'UTC', $bd_format);
+ DI::app()->data['mod-localtime'] = DateTimeFormat::convert($time, $_POST['timezone'], 'UTC', $bd_format);
}
}
public static function content(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$time = ($_REQUEST['time'] ?? '') ?: 'now';
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\User;
use Friendica\Network\HTTPException\ForbiddenException;
}
$uid = local_user();
- $orig_record = self::getApp()->user;
+ $orig_record = DI::app()->user;
if (Session::get('submanage')) {
$user = User::getById(Session::get('submanage'));
/** @var Authentication $authentication */
$authentication = self::getClass(Authentication::class);
- $authentication->setForUser(self::getApp(), $user, true, true);
+ $authentication->setForUser(DI::app(), $user, true, true);
if ($limited_id) {
Session::set('submanage', $original_id);
$ret = [];
Hook::callAll('home_init', $ret);
- self::getApp()->internalRedirect('profile/' . self::getApp()->user['nickname']);
+ DI::app()->internalRedirect('profile/' . DI::app()->user['nickname']);
// NOTREACHED
}
throw new ForbiddenException(L10n::t('Permission denied.'));
}
- $identities = self::getApp()->identities;
+ $identities = DI::app()->identities;
//getting additinal information for each identity
foreach ($identities as $key => $identity) {
$identities[$key]['thumb'] = $thumb['thumb'];
- $identities[$key]['selected'] = ($identity['nickname'] === self::getApp()->user['nickname']);
+ $identities[$key]['selected'] = ($identity['nickname'] === DI::app()->user['nickname']);
$condition = ["`uid` = ? AND `msg` != '' AND NOT (`type` IN (?, ?)) AND NOT `seen`", $identity['uid'], NOTIFY_INTRO, NOTIFY_MAIL];
$params = ['distinct' => true, 'expression' => 'parent'];
use Friendica\BaseModule;
use Friendica\Core\Protocol;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\User;
use Friendica\Network\HTTPException;
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
// @TODO: Replace with parameter from router
if (($app->argc != 3) || (!in_array($app->argv[1], ["post", "status_message", "reshare"]))) {
use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Network\HTTPException;
{
public static function content(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Protocol\OStatus;
/**
{
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$last_update = $_GET['last_update'] ?? '';
$nocache = !empty($_GET['nocache']) && local_user();
namespace Friendica\Module\Filer;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\FileTag;
use Friendica\Network\HTTPException;
use Friendica\Util\XML;
throw new HTTPException\ForbiddenException();
}
- $app = self::getApp();
+ $app = DI::app();
$logger = $app->getLogger();
$item_id = (($app->argc > 1) ? intval($app->argv[1]) : 0);
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Util\XML;
{
if (!local_user()) {
info(L10n::t('You must be logged in to use this module'));
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
}
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$logger = $a->getLogger();
$term = XML::unescape(trim($_GET['term'] ?? ''));
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Model\Introduction;
+use Friendica\DI;
/**
* Process follow request confirmations
{
public static function post(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$uid = local_user();
if (!$uid) {
use Friendica\BaseModule;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\User;
use Friendica\Protocol\ActivityPub;
{
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if (empty($a->argv[1])) {
use Friendica\BaseModule;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\User;
use Friendica\Protocol\ActivityPub;
{
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if (empty($a->argv[1])) {
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\User;
/**
{
public static function content(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
$visibleAddonList = Addon::getVisibleList();
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
// @TODO: Replace with parameter from router
if ($app->argc <= 1 || ($app->argv[1] !== 'json')) {
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Util\Strings;
{
public static function post(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if ($a->isAjax()) {
self::ajaxPost();
public static function ajaxPost()
{
try {
- $a = self::getApp();
+ $a = DI::app();
if (!local_user()) {
throw new \Exception(L10n::t('Permission denied.'), 403);
throw new \Friendica\Network\HTTPException\ForbiddenException();
}
- $a = self::getApp();
+ $a = DI::app();
$a->page['aside'] = Model\Group::sidebarWidget('contact', 'group', 'extended', (($a->argc > 1) ? $a->argv[1] : 'everyone'));
use Friendica\Content\Nav;
use Friendica\Content\Text\Markdown;
use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
$text = '';
$filename = '';
- $a = self::getApp();
+ $a = DI::app();
$config = $a->getConfig();
$lang = $config->get('system', 'language');
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Module\Security\Login;
/**
{
public static function content(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
// currently no returned data is used
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\HTTPSignature;
use Friendica\Util\Network;
{
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$postdata = Network::postdata();
use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Network\HTTPException;
use Friendica\Util\BasePath;
use Friendica\Util\Strings;
public static function init(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (!$a->getMode()->isInstall()) {
throw new HTTPException\ForbiddenException();
public static function post(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$configCache = $a->getConfigCache();
switch (self::$currentWizardStep) {
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$configCache = $a->getConfigCache();
$output = '';
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Network\HTTPException;
use Friendica\Protocol\Email;
self::checkFormSecurityTokenRedirectOnError('/', 'send_invite');
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
$max_invites = intval($config->get('system', 'max_invites'));
throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
}
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
$inviteOnly = false;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\FileTag;
use Friendica\Model\Group;
if (!empty($_REQUEST['body'])) {
$_REQUEST['return'] = 'network';
require_once 'mod/item.php';
- item_post(self::getApp());
+ item_post(DI::app());
} else {
notice(L10n::t('Please enter a post body.'));
}
return Login::form('compose', false);
}
- $a = self::getApp();
+ $a = DI::app();
if ($a->getCurrentTheme() !== 'frio') {
throw new NotImplementedException(L10n::t('This feature is only available with the frio theme.'));
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\Database;
+use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Network\HTTPException;
$rand = "?$rand";
}
- self::getApp()->internalRedirect($return_path . $rand);
+ DI::app()->internalRedirect($return_path . $rand);
}
// the json doesn't really matter, it will either be 0 or 1
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Core\Session;
use Friendica\Network\HTTPException;
$verb = 'like';
}
- $app = self::getApp();
+ $app = DI::app();
// @TODO: Replace with parameter from router
$itemId = (($app->argc > 1) ? Strings::escapeTags(trim($app->argv[1])) : 0);
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Util\HTTPSignature;
use Friendica\Util\Network;
{
public static function init(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$ret = ['success' => false, 'url' => '', 'message' => ''];
Logger::log('magic mdule: invoked', Logger::DEBUG);
$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site.
- if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], Strings::normaliseLink(self::getApp()->getBaseURL())) !== false) {
+ if (!empty($a->contact) && array_key_exists('id', $a->contact) && strpos($contact['nurl'], Strings::normaliseLink(DI::app()->getBaseURL())) !== false) {
if ($test) {
$ret['success'] = true;
$ret['message'] .= 'Local site - you are already authenticated.' . EOL;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
{
public static function content(array $parameters = [])
{
- $config = self::getApp()->getConfig();
+ $config = DI::app()->getConfig();
$reason = $config->get('system', 'maintenance_reason');
use Friendica\BaseModule;
use Friendica\Core\Renderer;
+use Friendica\DI;
class Manifest extends BaseModule
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
$tpl = Renderer::getMarkupTemplate('manifest.tpl');
use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\System;
+use Friendica\DI;
/**
* Standardized way of exposing metadata about a server running one of the distributed social networks.
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
if ($parameters['version'] == '1.0') {
self::printNodeInfo1($app);
use Friendica\BaseObject;
use Friendica\Core\L10n;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Notify as ModelNotify;
use Friendica\Network\HTTPException;
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if ($a->argc > 2 && $a->argv[1] === 'mark' && $a->argv[2] === 'all') {
*/
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if ($a->argc > 2 && $a->argv[1] === 'view' && intval($a->argv[2])) {
use Friendica\BaseModule;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Protocol\ActivityPub;
{
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (empty($a->argv[1])) {
throw new \Friendica\Network\HTTPException\NotFoundException();
use Friendica\BaseModule;
use Friendica\Content;
+use Friendica\DI;
use Friendica\Util\Strings;
/**
{
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// Unused form: /oembed/b2h?url=...
if ($a->argv[1] == 'b2h') {
use DOMDocument;
use DOMElement;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Util\XML;
/**
{
header('Content-type: application/opensearchdescription+xml');
- $hostname = self::getApp()->getHostName();
- $baseUrl = self::getApp()->getBaseURL();
+ $hostname = DI::app()->getHostName();
+ $baseUrl = DI::app()->getBaseURL();
/** @var DOMDocument $xml */
$xml = null;
use Friendica\BaseModule;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\User;
use Friendica\Protocol\ActivityPub;
{
public static function rawContent(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if (empty($a->argv[1])) {
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Photo as MPhoto;
use Friendica\Object\Image;
*/
public static function init(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if ($a->argc <= 1 || $a->argc > 4) {
throw new \Friendica\Network\HTTPException\BadRequestException();
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\Item;
/**
$returnPath = $_REQUEST['return'] ?? '';
if (!empty($returnPath)) {
$rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand';
- self::getApp()->internalRedirect($returnPath . $rand);
+ DI::app()->internalRedirect($returnPath . $rand);
}
// the json doesn't really matter, it will either be 0 or 1
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact as ContactModel;
use Friendica\Model\Group;
use Friendica\Model\Item;
public static function init(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
// @TODO: Replace with parameter from router
if ($a->argc < 2) {
public static function content(array $parameters = [], $update = 0)
{
- $a = self::getApp();
+ $a = DI::app();
if (!$update) {
ProfileModel::load($a, self::$which, self::$profile);
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Profile;
use Friendica\Util\Proxy as ProxyUtils;
throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.'));
}
- $a = self::getApp();
+ $a = DI::app();
//@TODO: Get value from router parameters
$nickname = $a->argv[1];
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Core\Logger;
+use Friendica\DI;
use Friendica\Model\Photo;
use Friendica\Object\Image;
use Friendica\Util\HTTPSignature;
public static function init(array $parameters = [])
{
// Set application instance here
- $a = self::getApp();
+ $a = DI::app();
/*
* Pictures are stored in one of the following ways:
*/
private static function getRequestInfo()
{
- $a = self::getApp();
+ $a = DI::app();
$size = 1024;
$sizetype = '';
*/
private static function setupDirectCache()
{
- $a = self::getApp();
+ $a = DI::app();
$basepath = $a->getBasePath();
// If the cache path isn't there, try to create it
use ASN_BASE;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\User;
use Friendica\Network\HTTPException\BadRequestException;
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
// @TODO: Replace with parameter from router
if ($app->argc !== 2) {
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
{
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
$contactUrl = GContact::getRandomUrl();
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Util\XML;
/**
{
header('Content-Type: text/xml');
- $app = self::getApp();
+ $app = DI::app();
$xml = null;
echo XML::fromArray([
'rsd' => [
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Util\Strings;
'$ask_password' => $ask_password,
'$password1' => ['password1', L10n::t('New Password:'), '', L10n::t('Leave empty for an auto generated password.')],
'$password2' => ['confirm', L10n::t('Confirm:'), '', ''],
- '$nickdesc' => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be "<strong>nickname@%s</strong>".', self::getApp()->getHostName()),
+ '$nickdesc' => L10n::t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be "<strong>nickname@%s</strong>".', DI::app()->getHostName()),
'$nicklabel' => L10n::t('Choose a nickname: '),
'$photo' => $photo,
'$publish' => $profile_publish,
'$username' => $username,
'$email' => $email,
'$nickname' => $nickname,
- '$sitename' => self::getApp()->getHostName(),
+ '$sitename' => DI::app()->getHostName(),
'$importh' => L10n::t('Import'),
'$importt' => L10n::t('Import your profile to this friendica instance'),
'$showtoslink' => Config::get('system', 'tosdisplay'),
{
BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
- $a = self::getApp();
+ $a = DI::app();
$arr = ['post' => $_POST];
Hook::callAll('register_post', $arr);
use Friendica\Content\Widget;
use Friendica\Core\L10n;
+use Friendica\DI;
use Friendica\Module\BaseSearchModule;
use Friendica\Module\Security\Login;
use Friendica\Util\Strings;
$search = Strings::escapeTags(trim(rawurldecode($_REQUEST['search'] ?? '')));
- $a = self::getApp();
+ $a = DI::app();
if (empty($a->page['aside'])) {
$a->page['aside'] = '';
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Term;
}
if (local_user()) {
- self::getApp()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
+ DI::app()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
}
Nav::setSelected('search');
Logger::info('Start Conversation.', ['q' => $search]);
- $o .= conversation(self::getApp(), $r, $pager, 'search', false, false, 'commented', local_user());
+ $o .= conversation(DI::app(), $r, $pager, 'search', false, false, 'commented', local_user());
$o .= $pager->renderMinimal(count($r));
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Util\Strings;
class Saved extends BaseModule
}
}
- self::getApp()->internalRedirect($return_url);
+ DI::app()->internalRedirect($return_url);
}
}
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
+use Friendica\DI;
use Friendica\Module\Register;
use Friendica\Util\Strings;
{
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (local_user()) {
$a->internalRedirect();
/** @var Authentication $authentication */
$authentication = self::getClass(Authentication::class);
$authentication->withPassword(
- self::getApp(),
+ DI::app(),
trim($_POST['username']),
trim($_POST['password']),
!empty($_POST['remember'])
*/
public static function form($return_path = null, $register = false, $hiddens = [])
{
- $a = self::getApp();
+ $a = DI::app();
$o = '';
$noid = Config::get('system', 'no_openid');
$o .= Renderer::replaceMacros(
$tpl,
[
- '$dest_url' => self::getApp()->getBaseURL(true) . '/login',
+ '$dest_url' => DI::app()->getBaseURL(true) . '/login',
'$logout' => L10n::t('Logout'),
'$login' => L10n::t('Login'),
use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\System;
+use Friendica\DI;
use Friendica\Model\Profile;
/**
System::externalRedirect($visitor_home);
} else {
info(L10n::t('Logged out.'));
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
}
}
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
+use Friendica\DI;
use Friendica\Model\TwoFactor\RecoveryCode;
/**
if (($_POST['action'] ?? '') == 'recover') {
self::checkFormSecurityTokenRedirectOnError('2fa', 'twofactor_recovery');
- $a = self::getApp();
+ $a = DI::app();
$recovery_code = $_POST['recovery_code'] ?? '';
public static function content(array $parameters = [])
{
if (!local_user()) {
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
// Already authenticated with 2FA token
if (Session::get('2fa')) {
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
return Renderer::replaceMacros(Renderer::getMarkupTemplate('twofactor/recovery.tpl'), [
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
+use Friendica\DI;
use PragmaRX\Google2FA\Google2FA;
/**
if (($_POST['action'] ?? '') == 'verify') {
self::checkFormSecurityTokenRedirectOnError('2fa', 'twofactor_verify');
- $a = self::getApp();
+ $a = DI::app();
$code = $_POST['verify_code'] ?? '';
public static function content(array $parameters = [])
{
if (!local_user()) {
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
// Already authenticated with 2FA token
if (Session::get('2fa')) {
- self::getApp()->internalRedirect();
+ DI::app()->internalRedirect();
}
return Renderer::replaceMacros(Renderer::getMarkupTemplate('twofactor/verify.tpl'), [
use Friendica\Core\Session;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\User;
use Friendica\Module\BaseSettingsModule;
use Friendica\Network\HTTPException;
{
public static function post(array $parameters = [])
{
- if (!local_user() || !empty(self::getApp()->user['uid']) && self::getApp()->user['uid'] != local_user()) {
+ if (!local_user() || !empty(DI::app()->user['uid']) && DI::app()->user['uid'] != local_user()) {
throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
}
if ($action === 'add' && $user_id) {
if (Session::get('submanage')) {
notice(L10n::t('Delegated administrators can view but not change delegation permissions.'));
- self::getApp()->internalRedirect('settings/delegation');
+ DI::app()->internalRedirect('settings/delegation');
}
$user = User::getById($user_id, ['nickname']);
notice(L10n::t('Delegate user not found.'));
}
- self::getApp()->internalRedirect('settings/delegation');
+ DI::app()->internalRedirect('settings/delegation');
}
if ($action === 'remove' && $user_id) {
if (Session::get('submanage')) {
notice(L10n::t('Delegated administrators can view but not change delegation permissions.'));
- self::getApp()->internalRedirect('settings/delegation');
+ DI::app()->internalRedirect('settings/delegation');
}
DBA::delete('manage', ['uid' => $user_id, 'mid' => local_user()]);
- self::getApp()->internalRedirect('settings/delegation');
+ DI::app()->internalRedirect('settings/delegation');
}
// find everybody that currently has delegated management to this account/page
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\TwoFactor\AppSpecificPassword;
use Friendica\Module\BaseSettingsModule;
use Friendica\Module\Security\Login;
$verified = PConfig::get(local_user(), '2fa', 'verified');
if (!$verified) {
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
notice(L10n::t('Please enter your password to access this page.'));
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
}
$description = $_POST['description'] ?? '';
if (empty($description)) {
notice(L10n::t('App-specific password generation failed: The description is empty.'));
- self::getApp()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
} elseif (AppSpecificPassword::checkDuplicateForUser(local_user(), $description)) {
notice(L10n::t('App-specific password generation failed: This description already exists.'));
- self::getApp()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
} else {
self::$appSpecificPassword = AppSpecificPassword::generateForUser(local_user(), $_POST['description'] ?? '');
notice(L10n::t('New app-specific password generated.'));
case 'revoke_all' :
AppSpecificPassword::deleteAllForUser(local_user());
notice(L10n::t('App-specific passwords successfully revoked.'));
- self::getApp()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
break;
}
}
notice(L10n::t('App-specific password successfully revoked.'));
}
- self::getApp()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
}
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
+use Friendica\DI;
use Friendica\Model\TwoFactor\AppSpecificPassword;
use Friendica\Model\TwoFactor\RecoveryCode;
use Friendica\Model\User;
PConfig::set(local_user(), '2fa', 'secret', $Google2FA->generateSecretKey(32));
- self::getApp()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
break;
case 'disable':
Session::remove('2fa');
notice(L10n::t('Two-factor authentication successfully disabled.'));
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
break;
case 'recovery':
if ($has_secret) {
- self::getApp()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
break;
case 'app_specific':
if ($has_secret) {
- self::getApp()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/app_specific?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
break;
case 'configure':
if (!$verified) {
- self::getApp()->internalRedirect('settings/2fa/verify?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/verify?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
break;
}
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Model\TwoFactor\RecoveryCode;
use Friendica\Module\BaseSettingsModule;
use Friendica\Module\Security\Login;
$secret = PConfig::get(local_user(), '2fa', 'secret');
if (!$secret) {
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
notice(L10n::t('Please enter your password to access this page.'));
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
}
if ($_POST['action'] == 'regenerate') {
RecoveryCode::regenerateForUser(local_user());
notice(L10n::t('New recovery codes successfully generated.'));
- self::getApp()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
+ DI::app()->internalRedirect('settings/2fa/recovery?t=' . self::getFormSecurityToken('settings_2fa_password'));
}
}
}
use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
+use Friendica\DI;
use Friendica\Module\BaseSettingsModule;
use Friendica\Module\Security\Login;
use PragmaRX\Google2FA\Google2FA;
$verified = PConfig::get(local_user(), '2fa', 'verified');
if ($secret && $verified) {
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
if (!self::checkFormSecurityToken('settings_2fa_password', 't')) {
notice(L10n::t('Please enter your password to access this page.'));
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
}
}
notice(L10n::t('Two-factor authentication successfully activated.'));
- self::getApp()->internalRedirect('settings/2fa');
+ DI::app()->internalRedirect('settings/2fa');
} else {
notice(L10n::t('Invalid code, please retry.'));
}
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
+use Friendica\DI;
use Friendica\Module\BaseSettingsModule;
/**
if ($args->getArgc() == 3) {
// @TODO Replace with router-provided arguments
$action = $args->get(2);
- $user = self::getApp()->user;
+ $user = DI::app()->user;
switch ($action) {
case "backup":
header("Content-type: application/json");
header('Content-Disposition: attachment; filename="' . $user['nickname'] . '.' . $action . '"');
- self::exportAll(self::getApp());
+ self::exportAll(DI::app());
exit();
break;
case "account":
header("Content-type: application/json");
header('Content-Disposition: attachment; filename="' . $user['nickname'] . '.' . $action . '"');
- self::exportAccount(self::getApp());
+ self::exportAccount(DI::app());
exit();
break;
case "contact":
}
private static function exportMultiRow(string $query)
{
- $dbStructure = DBStructure::definition(self::getApp()->getBasePath(), false);
+ $dbStructure = DBStructure::definition(DI::app()->getBasePath(), false);
preg_match("/\s+from\s+`?([a-z\d_]+)`?/i", $query, $match);
$table = $match[1];
private static function exportRow(string $query)
{
- $dbStructure = DBStructure::definition(self::getApp()->getBasePath(), false);
+ $dbStructure = DBStructure::definition(DI::app()->getBasePath(), false);
preg_match("/\s+from\s+`?([a-z\d_]+)`?/i", $query, $match);
$table = $match[1];
use Friendica\Content;
use Friendica\Core\Renderer;
use Friendica\Core\System;
+use Friendica\DI;
/**
* Prints the possible Smilies of this node
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
if (!empty($app->argv[1]) && ($app->argv[1] === "json")) {
$smilies = Content\Smilies::getList();
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\Item;
/**
$returnPath = $_REQUEST['return'] ?? '';
if (!empty($returnPath)) {
$rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand';
- self::getApp()->internalRedirect($returnPath . $rand);
+ DI::app()->internalRedirect($returnPath . $rand);
}
// the json doesn't really matter, it will either be 0 or 1
use Friendica\BaseModule;
use Friendica\Core\Addon;
use Friendica\Core\System;
+use Friendica\DI;
class Statistics extends BaseModule
{
public static function init(array $parameters = [])
{
- $config = self::getApp()->getConfig();
+ $config = DI::app()->getConfig();
if (!$config->get("system", "nodeinfo")) {
throw new \Friendica\Network\HTTPException\NotFoundException();
public static function rawContent(array $parameters = [])
{
- $config = self::getApp()->getConfig();
- $logger = self::getApp()->getLogger();
+ $config = DI::app()->getConfig();
+ $logger = DI::app()->getLogger();
$registration_open =
intval($config->get('config', 'register_policy')) !== Register::CLOSED
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Util\Strings;
/**
{
header("Content-Type: text/css");
- $a = self::getApp();
+ $a = DI::app();
if ($a->argc == 4) {
$theme = $a->argv[2];
namespace Friendica\Module;
use Friendica\BaseModule;
+use Friendica\DI;
/**
* Toggles the mobile view (on/off)
{
public static function content(array $parameters = [])
{
- $a = self::getApp();
+ $a = DI::app();
if (isset($_GET['off'])) {
$_SESSION['show-mobile'] = false;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Content\Text\BBCode;
+use Friendica\DI;
class Tos extends BaseModule
{
public static function init(array $parameters = [])
{
if (strlen(Config::get('system','singleuser'))) {
- self::getApp()->internalRedirect('profile/' . Config::get('system','singleuser'));
+ DI::app()->internalRedirect('profile/' . Config::get('system','singleuser'));
}
}
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
+use Friendica\DI;
/**
* Prints the welcome page for new users
{
public static function content(array $parameters = [])
{
- $config = self::getApp()->getConfig();
+ $config = DI::app()->getConfig();
$mail_disabled = ((function_exists('imap_open') &&
(!$config->get('system', 'imap_disabled'))));
use Friendica\BaseModule;
use Friendica\Core\Renderer;
+use Friendica\DI;
use Friendica\Protocol\Salmon;
use Friendica\Util\Crypto;
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
header('Content-type: text/xml');
use Friendica\App;
use Friendica\BaseModule;
+use Friendica\DI;
/**
* Standardized way of exposing metadata about a server running one of the distributed social networks.
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
self::printWellKnown($app);
}
namespace Friendica\Module\WellKnown;
use Friendica\BaseModule;
+use Friendica\DI;
use Friendica\Model\Search;
/**
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
$config = $app->getConfig();
$subscribe = $config->get('system', 'relay_subscribe', false);
use Friendica\Core\Hook;
use Friendica\Core\Renderer;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Photo;
use Friendica\Model\User;
use Friendica\Protocol\ActivityNamespace;
{
public static function rawContent(array $parameters = [])
{
- $app = self::getApp();
+ $app = DI::app();
// @TODO: Replace with parameter from router
if ($app->argv[0] == 'xrd') {
use Friendica\Core\Logger;
use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use OAuthServer;
use OAuthSignatureMethod_HMAC_SHA1;
use OAuthSignatureMethod_PLAINTEXT;
public function loginUser($uid)
{
Logger::log("FKOAuth1::loginUser $uid");
- $a = BaseObject::getApp();
+ $a = DI::app();
$record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
if (!DBA::isResult($record)) {
use Friendica\Core\Renderer;
use Friendica\Core\Session;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Item;
use Friendica\Model\Term;
*/
public function getTemplateData(array $conv_responses, $thread_level = 1)
{
- $a = self::getApp();
+ $a = DI::app();
$item = $this->getData();
$edited = false;
*/
private function getDefaultText()
{
- $a = self::getApp();
+ $a = DI::app();
if (!local_user()) {
return '';
*/
private function getCommentBox($indent)
{
- $a = self::getApp();
+ $a = DI::app();
$comment_box = '';
$conv = $this->getThread();
*/
protected function checkWallToWall()
{
- $a = self::getApp();
+ $a = DI::app();
$conv = $this->getThread();
$this->wall_to_wall = false;
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
+use Friendica\DI;
use Friendica\Protocol\Activity;
use Friendica\Util\Security;
return;
}
- $a = self::getApp();
+ $a = DI::app();
switch ($mode) {
case 'network':
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
{
return ['type' => 'Service',
'name' => FRIENDICA_PLATFORM . " '" . FRIENDICA_CODENAME . "' " . FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
- 'url' => BaseObject::getApp()->getBaseURL()];
+ 'url' => DI::app()->getBaseURL()];
}
/**
use Friendica\Core\Cache;
use Friendica\Core\Logger;
use Friendica\Core\System;
+use Friendica\DI;
use Imagick;
/**
$stamp1 = microtime(true);
file_put_contents($tempfile, $img_str);
- BaseObject::getApp()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+ DI::app()->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
$data = getimagesize($tempfile);
unlink($tempfile);
use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\System;
+use Friendica\DI;
/**
* @brief Proxy utilities class
public static function proxifyUrl($url, $writemode = false, $size = '')
{
// Get application instance
- $a = BaseObject::getApp();
+ $a = DI::app();
// Trim URL first
$url = trim($url);
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Util\DateTimeFormat;
{
public static function execute()
{
- $a = BaseObject::getApp();
+ $a = DI::app();
$last = Config::get('system', 'last_cron');
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Database\PostUpdate;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\GContact;
use Friendica\Model\GServer;
{
public static function execute($command = '')
{
- $a = BaseObject::getApp();
+ $a = DI::app();
// No parameter set? So return
if ($command == '') {
use Friendica\BaseObject;
use Friendica\Core\Config;
use Friendica\Core\Update;
+use Friendica\DI;
class DBUpdate extends BaseObject
{
{
// Just in case the last update wasn't failed
if (Config::get('system', 'update', Update::SUCCESS, true) != Update::FAILED) {
- Update::run(self::getApp()->getBasePath());
+ Update::run(DI::app()->getBasePath());
}
}
}
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\Diaspora;
// if $parent['wall'] == 1 we will already have the parent message in our array
// and we will relay the whole lot.
- $localhost = self::getApp()->getHostName();
+ $localhost = DI::app()->getHostName();
if (strpos($localhost, ':')) {
$localhost = substr($localhost, 0, strpos($localhost, ':'));
}
$headers = 'From: ' . Email::encodeHeader($local_user['username'],'UTF-8') . ' <' . $local_user['email'] . '>' . "\n";
}
} else {
- $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . self::getApp()->getHostName() . '>' . "\n";
+ $headers = 'From: '. Email::encodeHeader($local_user['username'], 'UTF-8') . ' <noreply@' . DI::app()->getHostName() . '>' . "\n";
}
$headers .= 'Message-Id: <' . Email::iri2msgid($target_item['uri']) . '>' . "\n";
use Friendica\Core\Logger;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Item;
class Expire
{
public static function execute($param = '', $hook_function = '')
{
- $a = BaseObject::getApp();
+ $a = DI::app();
Hook::loadHooks();
namespace Friendica\Worker;
use Friendica\Core\Hook;
+use Friendica\DI;
Class ForkHook
{
public static function execute($name, $hook, $data)
{
- $a = \Friendica\BaseObject::getApp();
+ $a = DI::app();
Hook::callSingle($a, $name, $hook, $data);
}
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
{
public static function execute($cmd, $target_id)
{
- $a = BaseObject::getApp();
+ $a = DI::app();
Logger::info('Invoked', ['cmd' => $cmd, 'target' => $target_id]);
use Friendica\BaseObject;
use Friendica\Core\Logger;
use Friendica\Core\Worker;
+use Friendica\DI;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\ActivityPub;
return;
}
- $a = BaseObject::getApp();
+ $a = DI::app();
$inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser($uid);
use Friendica\Core\Session\ISession;
use Friendica\Core\System;
use Friendica\Database\Database;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Network\HTTPException;
use Friendica\Test\Util\Database\StaticDatabase;
$this->loadFixture(__DIR__ . '/../datasets/api.fixture.php', $dba);
/** @var App app */
- $this->app = BaseObject::getApp();
+ $this->app = DI::app();
$this->app->argc = 1;
$this->app->argv = ['home'];
+++ /dev/null
-<?php
-/**
- * BaseObjectTest class.
- */
-
-namespace Friendica\Test\src;
-
-use Friendica\BaseObject;
-use Friendica\Test\Util\AppMockTrait;
-use Friendica\Test\Util\VFSTrait;
-use PHPUnit\Framework\TestCase;
-
-/**
- * Tests for the BaseObject class.
- */
-class BaseObjectTest extends TestCase
-{
- use VFSTrait;
- use AppMockTrait;
-
- /**
- * @var BaseObject
- */
- private $baseObject;
-
- /**
- * Test the getApp() function without App
- * @expectedException Friendica\Network\HTTPException\InternalServerErrorException
- * @runInSeparateProcess
- * @preserveGlobalState disabled
- */
- public function testGetAppFailed()
- {
- BaseObject::getApp();
- }
-}
projects / friendica.git / commitdiff