Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 10:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8053 from nupplaphil/task/remove_get_app

Browse source 
Remove get_app() in favor of DI::app()
This commit is contained in:
Michael Vogel 2020-01-04 23:41:51 +01:00 committed by GitHub
commit c8a322baf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 113 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
boot.php
View file

@ -234,29 +234,6 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) {
define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED); define('CURLE_OPERATION_TIMEDOUT', CURLE_OPERATION_TIMEOUTED);
} }
/**
* @brief Retrieve the App structure
*
* Useful in functions which require it but don't get it passed to them
*
* @deprecated since version 2018.09
* @see DI::app()
* @return App
*/
function get_app()
{
return DI::app();
}
/**
* @brief Used to end the current process, after saving session state.
* @deprecated
*/
function killme()
{
exit();
}
/** /**
* @brief Returns the user id of locally logged in user or false. * @brief Returns the user id of locally logged in user or false.
* *
@ -325,7 +302,7 @@ function notice($s)
return; return;
} }
$a = \get_app(); $a = DI::app();
if (empty($_SESSION['sysmsg'])) { if (empty($_SESSION['sysmsg'])) {
$_SESSION['sysmsg'] = []; $_SESSION['sysmsg'] = [];
} }
@ -343,7 +320,7 @@ function notice($s)
*/ */
function info($s) function info($s)
{ {
$a = \get_app(); $a = DI::app();
if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) { if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
return; return;
@ -406,7 +383,7 @@ function feed_birthday($uid, $tz)
*/ */
function is_site_admin() function is_site_admin()
{ {
$a = \get_app(); $a = DI::app();
$admin_email = Config::get('config', 'admin_email'); $admin_email = Config::get('config', 'admin_email');

86
include/api.php
View file

@ -930,7 +930,7 @@ function api_format_data($root_element, $type, $data)
*/ */
function api_account_verify_credentials($type) function api_account_verify_credentials($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -998,7 +998,7 @@ function requestdata($k)
*/ */
function api_statuses_mediap($type) function api_statuses_mediap($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::log('api_statuses_update: no user'); Logger::log('api_statuses_update: no user');
@ -1052,7 +1052,7 @@ api_register_func('api/statuses/mediap', 'api_statuses_mediap', true, API_METHOD
*/ */
function api_statuses_update($type) function api_statuses_update($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::log('api_statuses_update: no user'); Logger::log('api_statuses_update: no user');
@ -1202,7 +1202,7 @@ api_register_func('api/statuses/update_with_media', 'api_statuses_update', true,
*/ */
function api_media_upload() function api_media_upload()
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::log('no user'); Logger::log('no user');
@ -1257,7 +1257,7 @@ api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST)
*/ */
function api_media_metadata_create($type) function api_media_metadata_create($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
Logger::info('no user'); Logger::info('no user');
@ -1404,7 +1404,7 @@ api_register_func('api/externalprofile/show', 'api_users_show');
*/ */
function api_users_search($type) function api_users_search($type)
{ {
$a = \get_app(); $a = DI::app();
$userlist = []; $userlist = [];
@ -1466,7 +1466,7 @@ function api_users_lookup($type)
if (!empty($_REQUEST['user_id'])) { if (!empty($_REQUEST['user_id'])) {
foreach (explode(',', $_REQUEST['user_id']) as $id) { foreach (explode(',', $_REQUEST['user_id']) as $id) {
if (!empty($id)) { if (!empty($id)) {
$users[] = api_get_user(get_app(), $id); $users[] = api_get_user(DI::app(), $id);
} }
} }
} }
@ -1497,7 +1497,7 @@ api_register_func('api/users/lookup', 'api_users_lookup', true);
*/ */
function api_search($type) function api_search($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -1611,7 +1611,7 @@ api_register_func('api/search', 'api_search', true);
*/ */
function api_statuses_home_timeline($type) function api_statuses_home_timeline($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -1704,7 +1704,7 @@ api_register_func('api/statuses/friends_timeline', 'api_statuses_home_timeline',
*/ */
function api_statuses_public_timeline($type) function api_statuses_public_timeline($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -1789,7 +1789,7 @@ api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline'
*/ */
function api_statuses_networkpublic_timeline($type) function api_statuses_networkpublic_timeline($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -1850,7 +1850,7 @@ api_register_func('api/statuses/networkpublic_timeline', 'api_statuses_networkpu
*/ */
function api_statuses_show($type) function api_statuses_show($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -1929,7 +1929,7 @@ api_register_func('api/statuses/show', 'api_statuses_show', true);
*/ */
function api_conversation_show($type) function api_conversation_show($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -2011,7 +2011,7 @@ function api_statuses_repeat($type)
{ {
global $called_api; global $called_api;
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -2088,7 +2088,7 @@ api_register_func('api/statuses/retweet', 'api_statuses_repeat', true, API_METHO
*/ */
function api_statuses_destroy($type) function api_statuses_destroy($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -2135,7 +2135,7 @@ api_register_func('api/statuses/destroy', 'api_statuses_destroy', true, API_METH
*/ */
function api_statuses_mentions($type) function api_statuses_mentions($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -2204,7 +2204,7 @@ api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
*/ */
function api_statuses_user_timeline($type) function api_statuses_user_timeline($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -2288,7 +2288,7 @@ api_register_func('api/statuses/user_timeline', 'api_statuses_user_timeline', tr
*/ */
function api_favorites_create_destroy($type) function api_favorites_create_destroy($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -2371,7 +2371,7 @@ function api_favorites($type)
{ {
global $called_api; global $called_api;
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -2836,7 +2836,7 @@ function api_contactlink_to_array($txt)
*/ */
function api_format_items_activities($item, $type = "json") function api_format_items_activities($item, $type = "json")
{ {
$a = \get_app(); $a = DI::app();
$activities = [ $activities = [
'like' => [], 'like' => [],
@ -3257,7 +3257,7 @@ api_register_func('api/lists/subscriptions', 'api_lists_list', true);
*/ */
function api_lists_ownerships($type) function api_lists_ownerships($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -3306,7 +3306,7 @@ api_register_func('api/lists/ownerships', 'api_lists_ownerships', true);
*/ */
function api_lists_statuses($type) function api_lists_statuses($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -3384,7 +3384,7 @@ api_register_func('api/lists/statuses', 'api_lists_statuses', true);
*/ */
function api_statuses_f($qtype) function api_statuses_f($qtype)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -3636,7 +3636,7 @@ function api_ff_ids($type, int $rel)
throw new ForbiddenException(); throw new ForbiddenException();
} }
$a = \get_app(); $a = DI::app();
api_get_user($a); api_get_user($a);
@ -3723,7 +3723,7 @@ api_register_func('api/followers/ids', 'api_followers_ids', true);
*/ */
function api_direct_messages_new($type) function api_direct_messages_new($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -3815,7 +3815,7 @@ api_register_func('api/direct_messages/new', 'api_direct_messages_new', true, AP
*/ */
function api_direct_messages_destroy($type) function api_direct_messages_destroy($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -3983,7 +3983,7 @@ api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, AP
*/ */
function api_direct_messages_box($type, $box, $verbose) function api_direct_messages_box($type, $box, $verbose)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
@ -4627,7 +4627,7 @@ function api_account_update_profile_image($type)
Contact::updateSelfFromUserID(api_user(), true); Contact::updateSelfFromUserID(api_user(), true);
// Update global directory in background // Update global directory in background
$url = DI::baseUrl() . '/profile/' . \get_app()->user['nickname']; $url = DI::baseUrl() . '/profile/' . DI::app()->user['nickname'];
if ($url && strlen(Config::get('system', 'directory'))) { if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "Directory", $url); Worker::add(PRIORITY_LOW, "Directory", $url);
} }
@ -4668,7 +4668,7 @@ api_register_func('api/account/update_profile_image', 'api_account_update_profil
function api_account_update_profile($type) function api_account_update_profile($type)
{ {
$local_user = api_user(); $local_user = api_user();
$api_user = api_get_user(get_app()); $api_user = api_get_user(DI::app());
if (!empty($_POST['name'])) { if (!empty($_POST['name'])) {
DBA::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]); DBA::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
@ -4963,7 +4963,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
*/ */
function prepare_photo_data($type, $scale, $photo_id) function prepare_photo_data($type, $scale, $photo_id)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if ($user_info === false) { if ($user_info === false) {
@ -5391,7 +5391,7 @@ function api_best_nickname(&$contacts)
*/ */
function api_friendica_group_show($type) function api_friendica_group_show($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5461,7 +5461,7 @@ api_register_func('api/friendica/group_show', 'api_friendica_group_show', true);
*/ */
function api_friendica_group_delete($type) function api_friendica_group_delete($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5528,7 +5528,7 @@ api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', tr
*/ */
function api_lists_destroy($type) function api_lists_destroy($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5650,7 +5650,7 @@ function group_create($name, $uid, $users = [])
*/ */
function api_friendica_group_create($type) function api_friendica_group_create($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5684,7 +5684,7 @@ api_register_func('api/friendica/group_create', 'api_friendica_group_create', tr
*/ */
function api_lists_create($type) function api_lists_create($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5723,7 +5723,7 @@ api_register_func('api/lists/create', 'api_lists_create', true, API_METHOD_POST)
*/ */
function api_friendica_group_update($type) function api_friendica_group_update($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5802,7 +5802,7 @@ api_register_func('api/friendica/group_update', 'api_friendica_group_update', tr
*/ */
function api_lists_update($type) function api_lists_update($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5852,7 +5852,7 @@ api_register_func('api/lists/update', 'api_lists_update', true, API_METHOD_POST)
*/ */
function api_friendica_activity($type) function api_friendica_activity($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5899,7 +5899,7 @@ api_register_func('api/friendica/activity/unattendmaybe', 'api_friendica_activit
*/ */
function api_friendica_notification($type) function api_friendica_notification($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -5937,7 +5937,7 @@ function api_friendica_notification($type)
*/ */
function api_friendica_notification_seen($type) function api_friendica_notification_seen($type)
{ {
$a = \get_app(); $a = DI::app();
$user_info = api_get_user($a); $user_info = api_get_user($a);
if (api_user() === false || $user_info === false) { if (api_user() === false || $user_info === false) {
@ -5987,7 +5987,7 @@ api_register_func('api/friendica/notification', 'api_friendica_notification', tr
*/ */
function api_friendica_direct_messages_setseen($type) function api_friendica_direct_messages_setseen($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
@ -6041,7 +6041,7 @@ api_register_func('api/friendica/direct_messages_setseen', 'api_friendica_direct
*/ */
function api_friendica_direct_messages_search($type, $box = "") function api_friendica_direct_messages_search($type, $box = "")
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -6109,7 +6109,7 @@ api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_
*/ */
function api_friendica_profile_show($type) function api_friendica_profile_show($type)
{ {
$a = \get_app(); $a = DI::app();
if (api_user() === false) { if (api_user() === false) {
throw new ForbiddenException(); throw new ForbiddenException();

2
include/enotify.php
View file

@ -33,7 +33,7 @@ use Friendica\Util\Strings;
*/ */
function notification($params) function notification($params)
{ {
$a = \get_app(); $a = DI::app();
// Temporary logging for finding the origin // Temporary logging for finding the origin
if (!isset($params['uid'])) { if (!isset($params['uid'])) {

2
mod/fbrowser.php
View file

@ -78,7 +78,7 @@ function fbrowser_content(App $a)
function _map_files1($rr) function _map_files1($rr)
{ {
$a = \get_app(); $a = DI::app();
$types = Images::supportedTypes(); $types = Images::supportedTypes();
$ext = $types[$rr['type']]; $ext = $types[$rr['type']];
$filename_e = $rr['filename']; $filename_e = $rr['filename'];

2
mod/item.php
View file

@ -848,7 +848,7 @@ function item_post(App $a) {
function item_post_return($baseurl, $api_source, $return_path) function item_post_return($baseurl, $api_source, $return_path)
{ {
// figure out how to return, depending on from whence we came // figure out how to return, depending on from whence we came
$a = \get_app(); $a = DI::app();
if ($api_source) { if ($api_source) {
return; return;

2
mod/message.php
View file

@ -499,7 +499,7 @@ function get_messages($uid, $start, $limit)
function render_messages(array $msg, $t) function render_messages(array $msg, $t)
{ {
$a = \get_app(); $a = DI::app();
$tpl = Renderer::getMarkupTemplate($t); $tpl = Renderer::getMarkupTemplate($t);
$rslt = ''; $rslt = '';

2
mod/photos.php
View file

@ -814,7 +814,7 @@ function photos_post(App $a)
Hook::callAll('photo_post_end', $item_id); Hook::callAll('photo_post_end', $item_id);
// addon uploaders should call "killme()" [e.g. exit] within the photo_post_end hook // addon uploaders should call "exit()" within the photo_post_end hook
// if they do not wish to be redirected // if they do not wish to be redirected
DI::baseUrl()->redirect($_SESSION['photo_return']); DI::baseUrl()->redirect($_SESSION['photo_return']);

2
mod/settings.php
View file

@ -33,7 +33,7 @@ function get_theme_config_file($theme)
{ {
$theme = Strings::sanitizeFilePathItem($theme); $theme = Strings::sanitizeFilePathItem($theme);
$a = \get_app(); $a = DI::app();
$base_theme = $a->theme_info['extends'] ?? ''; $base_theme = $a->theme_info['extends'] ?? '';
if (file_exists("view/theme/$theme/config.php")) { if (file_exists("view/theme/$theme/config.php")) {

8
src/BaseModule.php
View file

@ -88,7 +88,7 @@ abstract class BaseModule
*/ */
public static function getFormSecurityToken($typename = '') public static function getFormSecurityToken($typename = '')
{ {
$a = \get_app(); $a = DI::app();
$timestamp = time(); $timestamp = time();
$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename); $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
@ -116,7 +116,7 @@ abstract class BaseModule
$max_livetime = 10800; // 3 hours $max_livetime = 10800; // 3 hours
$a = \get_app(); $a = DI::app();
$x = explode('.', $hash); $x = explode('.', $hash);
if (time() > (intval($x[0]) + $max_livetime)) { if (time() > (intval($x[0]) + $max_livetime)) {
@ -136,7 +136,7 @@ abstract class BaseModule
public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token') public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
{ {
if (!self::checkFormSecurityToken($typename, $formname)) { if (!self::checkFormSecurityToken($typename, $formname)) {
$a = \get_app(); $a = DI::app();
Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename); Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA); Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
notice(self::getFormSecurityStandardErrorMessage()); notice(self::getFormSecurityStandardErrorMessage());
@ -147,7 +147,7 @@ abstract class BaseModule
public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token') public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
{ {
if (!self::checkFormSecurityToken($typename, $formname)) { if (!self::checkFormSecurityToken($typename, $formname)) {
$a = \get_app(); $a = DI::app();
Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename); Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA); Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);

14
src/Console/DocBloxErrorChecker.php
View file

@ -2,6 +2,8 @@
namespace Friendica\Console; namespace Friendica\Console;
use Friendica\App;
/** /**
* When I installed docblox, I had the experience that it does not generate any output at all. * When I installed docblox, I had the experience that it does not generate any output at all.
* This script may be used to find that kind of problems with the documentation build process. * This script may be used to find that kind of problems with the documentation build process.
@ -29,6 +31,16 @@ class DocBloxErrorChecker extends \Asika\SimpleConsole\Console
protected $helpOptions = ['h', 'help', '?']; protected $helpOptions = ['h', 'help', '?'];
/** @var App */
private $app;
public function __construct(App $app, array $argv = null)
{
parent::__construct($argv);
$this->app = $app;
}
protected function getHelp() protected function getHelp()
{ {
$help = <<<HELP $help = <<<HELP
@ -59,7 +71,7 @@ HELP;
throw new \RuntimeException('DocBlox isn\'t available.'); throw new \RuntimeException('DocBlox isn\'t available.');
} }
$dir = \get_app()->getBasePath(); $dir = $this->app->getBasePath();
//stack for dirs to search //stack for dirs to search
$dirstack = []; $dirstack = [];

14
src/Console/PhpToPo.php
View file

@ -2,6 +2,8 @@
namespace Friendica\Console; namespace Friendica\Console;
use Friendica\App;
/** /**
* Read a strings.php file and create messages.po in the same directory * Read a strings.php file and create messages.po in the same directory
* *
@ -15,6 +17,16 @@ class PhpToPo extends \Asika\SimpleConsole\Console
private $normBaseMsgIds = []; private $normBaseMsgIds = [];
const NORM_REGEXP = "|[\\\]|"; const NORM_REGEXP = "|[\\\]|";
/** @var App */
private $app;
public function __construct(App $app, array $argv = null)
{
parent::__construct($argv);
$this->app = $app;
}
protected function getHelp() protected function getHelp()
{ {
$help = <<<HELP $help = <<<HELP
@ -51,7 +63,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
} }
$a = \get_app(); $a = $this->app;
$phpfile = realpath($this->getArgument(0)); $phpfile = realpath($this->getArgument(0));

2
src/Content/OEmbed.php
View file

@ -57,7 +57,7 @@ class OEmbed
{ {
$embedurl = trim($embedurl, '\'"'); $embedurl = trim($embedurl, '\'"');
$a = \get_app(); $a = DI::app();
$cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl; $cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl;

3
src/Content/Text/HTML.php
View file

@ -12,6 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
@ -815,7 +816,7 @@ class HTML
*/ */
public static function contactBlock() public static function contactBlock()
{ {
$a = \get_app(); $a = DI::app();
return ContactBlock::getHTML($a->profile); return ContactBlock::getHTML($a->profile);
} }

4
src/Content/Widget.php
View file

@ -302,7 +302,7 @@ class Widget
*/ */
public static function categories($baseurl, $selected = '') public static function categories($baseurl, $selected = '')
{ {
$a = \get_app(); $a = DI::app();
$uid = intval($a->profile['profile_uid']); $uid = intval($a->profile['profile_uid']);
@ -420,7 +420,7 @@ class Widget
*/ */
public static function tagCloud($limit = 50) public static function tagCloud($limit = 50)
{ {
$a = \get_app(); $a = DI::app();
$uid = intval($a->profile['profile_uid']); $uid = intval($a->profile['profile_uid']);

3
src/Content/Widget/CalendarExport.php
View file

@ -9,6 +9,7 @@ namespace Friendica\Content\Widget;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI;
/** /**
* TagCloud widget * TagCloud widget
@ -24,7 +25,7 @@ class CalendarExport
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function getHTML() { public static function getHTML() {
$a = \get_app(); $a = DI::app();
if (empty($a->data['user'])) { if (empty($a->data['user'])) {
return; return;

1
src/Core/System.php
View file

@ -283,7 +283,6 @@ class System
/// @todo Move the following functions from boot.php /// @todo Move the following functions from boot.php
/* /*
function killme()
function local_user() function local_user()
function public_contact() function public_contact()
function remote_user() function remote_user()

6
src/Core/Worker.php
View file

@ -48,8 +48,6 @@ class Worker
*/ */
public static function processQueue($run_cron = true) public static function processQueue($run_cron = true)
{ {
$a = \get_app();
// Ensure that all "strtotime" operations do run timezone independent // Ensure that all "strtotime" operations do run timezone independent
date_default_timezone_set('UTC'); date_default_timezone_set('UTC');
@ -372,7 +370,7 @@ class Worker
*/ */
private static function execFunction($queue, $funcname, $argv, $method_call) private static function execFunction($queue, $funcname, $argv, $method_call)
{ {
$a = \get_app(); $a = DI::app();
$argc = count($argv); $argc = count($argv);
@ -1083,7 +1081,7 @@ class Worker
$args = ['no_cron' => !$do_cron]; $args = ['no_cron' => !$do_cron];
$a = get_app(); $a = DI::app();
$process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath()); $process = new Core\Process(DI::logger(), DI::mode(), DI::config(), $a->getBasePath());
$process->run($command, $args); $process->run($command, $args);

2
src/Model/Contact.php
View file

@ -2220,7 +2220,7 @@ class Contact
{ {
$result = ['cid' => -1, 'success' => false, 'message' => '']; $result = ['cid' => -1, 'success' => false, 'message' => ''];
$a = \get_app(); $a = DI::app();
// remove ajax junk, e.g. Twitter // remove ajax junk, e.g. Twitter
$url = str_replace('/#!/', '/', $url); $url = str_replace('/#!/', '/', $url);

2
src/Model/Mail.php
View file

@ -105,7 +105,7 @@ class Mail
*/ */
public static function send($recipient = 0, $body = '', $subject = '', $replyto = '') public static function send($recipient = 0, $body = '', $subject = '', $replyto = '')
{ {
$a = \get_app(); $a = DI::app();
if (!$recipient) { if (!$recipient) {
return -1; return -1;

2
src/Model/Photo.php
View file

@ -461,7 +461,7 @@ class Photo
$micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix; $micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix;
// Remove the cached photo // Remove the cached photo
$a = \get_app(); $a = DI::app();
$basepath = $a->getBasePath(); $basepath = $a->getBasePath();
if (is_dir($basepath . "/photo")) { if (is_dir($basepath . "/photo")) {

8
src/Model/Profile.php
View file

@ -568,7 +568,7 @@ class Profile
public static function getBirthdays() public static function getBirthdays()
{ {
$a = \get_app(); $a = DI::app();
$o = ''; $o = '';
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) { if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
@ -665,7 +665,7 @@ class Profile
public static function getEventsReminderHTML() public static function getEventsReminderHTML()
{ {
$a = \get_app(); $a = DI::app();
$o = ''; $o = '';
if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) { if (!local_user() || DI::mode()->isMobile() || DI::mode()->isMobile()) {
@ -1106,7 +1106,7 @@ class Profile
*/ */
public static function addVisitorCookieForHandle($handle) public static function addVisitorCookieForHandle($handle)
{ {
$a = \get_app(); $a = DI::app();
// Try to find the public contact entry of the visitor. // Try to find the public contact entry of the visitor.
$cid = Contact::getIdForURL($handle); $cid = Contact::getIdForURL($handle);
@ -1144,7 +1144,7 @@ class Profile
*/ */
public static function openWebAuthInit($token) public static function openWebAuthInit($token)
{ {
$a = \get_app(); $a = DI::app();
// Clean old OpenWebAuthToken entries. // Clean old OpenWebAuthToken entries.
OpenWebAuthToken::purge('owt', '3 MINUTE'); OpenWebAuthToken::purge('owt', '3 MINUTE');

2
src/Protocol/DFRN.php
View file

@ -146,7 +146,7 @@ class DFRN
*/ */
public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
{ {
$a = \get_app(); $a = DI::app();
$sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
$public_feed = (($dfrn_id) ? false : true); $public_feed = (($dfrn_id) ? false : true);

3
src/Render/FriendicaSmarty.php
View file

@ -4,6 +4,7 @@
*/ */
namespace Friendica\Render; namespace Friendica\Render;
use Friendica\DI;
use Smarty; use Smarty;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
@ -22,7 +23,7 @@ class FriendicaSmarty extends Smarty
{ {
parent::__construct(); parent::__construct();
$a = \get_app(); $a = DI::app();
$theme = $a->getCurrentTheme(); $theme = $a->getCurrentTheme();
// setTemplateDir can be set to an array, which Smarty will parse in order. // setTemplateDir can be set to an array, which Smarty will parse in order.

5
src/Render/FriendicaSmartyEngine.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Render; namespace Friendica\Render;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI;
/** /**
* Smarty implementation of the Friendica template engine interface * Smarty implementation of the Friendica template engine interface
@ -32,7 +33,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
$s = new FriendicaSmarty(); $s = new FriendicaSmarty();
} }
$r['$APP'] = \get_app(); $r['$APP'] = DI::app();
// "middleware": inject variables into templates // "middleware": inject variables into templates
$arr = [ $arr = [
@ -54,7 +55,7 @@ class FriendicaSmartyEngine implements ITemplateEngine
public function getTemplateFile($file, $root = '') public function getTemplateFile($file, $root = '')
{ {
$a = \get_app(); $a = DI::app();
$template = new FriendicaSmarty(); $template = new FriendicaSmarty();
// Make sure $root ends with a slash / // Make sure $root ends with a slash /

6
src/Util/Network.php
View file

@ -96,7 +96,7 @@ class Network
{ {
$stamp1 = microtime(true); $stamp1 = microtime(true);
$a = \get_app(); $a = DI::app();
if (strlen($url) > 1000) { if (strlen($url) > 1000) {
Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG); Logger::log('URL is longer than 1000 characters. Callstack: ' . System::callstack(20), Logger::DEBUG);
@ -260,7 +260,7 @@ class Network
return CurlResult::createErrorCurl($url); return CurlResult::createErrorCurl($url);
} }
$a = \get_app(); $a = DI::app();
$ch = curl_init($url); $ch = curl_init($url);
if (($redirects > 8) || (!$ch)) { if (($redirects > 8) || (!$ch)) {
@ -630,7 +630,7 @@ class Network
*/ */
public static function finalUrl(string $url, int $depth = 1, bool $fetchbody = false) public static function finalUrl(string $url, int $depth = 1, bool $fetchbody = false)
{ {
$a = \get_app(); $a = DI::app();
$url = self::stripTrackingQueryParams($url); $url = self::stripTrackingQueryParams($url);

6
tests/include/ApiTest.php
View file

@ -1383,7 +1383,7 @@ class ApiTest extends DatabaseTest
'type' => 'image/png' 'type' => 'image/png'
] ]
]; ];
$app = \get_app(); $app = DI::app();
$app->argc = 2; $app->argc = 2;
$result = api_media_upload(); $result = api_media_upload();
@ -3305,7 +3305,7 @@ class ApiTest extends DatabaseTest
*/ */
public function testApiOauthRequestToken() public function testApiOauthRequestToken()
{ {
$this->markTestIncomplete('killme() kills phpunit as well'); $this->markTestIncomplete('exit() kills phpunit as well');
} }
/** /**
@ -3315,7 +3315,7 @@ class ApiTest extends DatabaseTest
*/ */
public function testApiOauthAccessToken() public function testApiOauthAccessToken()
{ {
$this->markTestIncomplete('killme() kills phpunit as well'); $this->markTestIncomplete('exit() kills phpunit as well');
} }
/** /**

3
view/theme/frio/php/scheme.php
View file

@ -19,11 +19,12 @@
*/ */
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\DI;
use Friendica\Util\Strings; use Friendica\Util\Strings;
function get_scheme_info($scheme) function get_scheme_info($scheme)
{ {
$theme = \get_app()->getCurrentTheme(); $theme = DI::app()->getCurrentTheme();
$themepath = 'view/theme/' . $theme . '/'; $themepath = 'view/theme/' . $theme . '/';
if (empty($scheme)) { if (empty($scheme)) {
$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema')); $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));

2
view/theme/vier/theme.php
View file

@ -106,7 +106,7 @@ function get_vier_config($key, $default = false, $admin = false)
function vier_community_info() function vier_community_info()
{ {
$a = \get_app(); $a = DI::app();
$show_pages = get_vier_config("show_pages", 1); $show_pages = get_vier_config("show_pages", 1);
$show_profiles = get_vier_config("show_profiles", 1); $show_profiles = get_vier_config("show_profiles", 1);