From 5e1ceb57de62e4f2b6af957fa7952eed09c1aedb Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 27 Dec 2018 19:22:35 -0500 Subject: [PATCH] Escape global namespaced get_app() calls - Add deprecated status --- boot.php | 10 ++- include/api.php | 90 ++++++++++----------- include/enotify.php | 2 +- mod/fbrowser.php | 4 +- mod/item.php | 2 +- mod/lostpass.php | 2 +- mod/message.php | 2 +- mod/nodeinfo.php | 2 +- mod/ostatus_subscribe.php | 2 +- mod/regmod.php | 2 +- mod/repair_ostatus.php | 2 +- mod/settings.php | 2 +- src/BaseModule.php | 8 +- src/Content/OEmbed.php | 4 +- src/Content/Text/HTML.php | 2 +- src/Content/Widget.php | 6 +- src/Content/Widget/CalendarExport.php | 2 +- src/Core/Console/DocBloxErrorChecker.php | 2 +- src/Core/Console/GlobalCommunityBlock.php | 2 +- src/Core/Console/GlobalCommunitySilence.php | 2 +- src/Core/Console/NewPassword.php | 2 +- src/Core/Console/PhpToPo.php | 2 +- src/Core/Console/PoToPhp.php | 2 +- src/Core/Console/Typo.php | 2 +- src/Core/Theme.php | 8 +- src/Core/Worker.php | 6 +- src/Database/DBA.php | 10 +-- src/Model/Contact.php | 4 +- src/Model/GContact.php | 2 +- src/Model/Item.php | 6 +- src/Model/Mail.php | 2 +- src/Model/Photo.php | 2 +- src/Model/Profile.php | 8 +- src/Model/User.php | 4 +- src/Network/FKOAuth1.php | 2 +- src/Network/Probe.php | 2 +- src/Object/Image.php | 6 +- src/Protocol/DFRN.php | 10 +-- src/Protocol/Diaspora.php | 4 +- src/Protocol/Feed.php | 2 +- src/Protocol/OStatus.php | 2 +- src/Protocol/PortableContact.php | 2 +- src/Render/FriendicaSmarty.php | 2 +- src/Render/FriendicaSmartyEngine.php | 4 +- src/Util/ExAuth.php | 4 +- src/Util/Network.php | 6 +- src/Util/ParseUrl.php | 2 +- src/Util/Temporal.php | 2 +- tests/include/ApiTest.php | 2 +- view/theme/frio/php/scheme.php | 2 +- view/theme/smoothly/theme.php | 2 +- view/theme/vier/theme.php | 2 +- 52 files changed, 135 insertions(+), 133 deletions(-) diff --git a/boot.php b/boot.php index be217eadfc..cbaeeff0aa 100644 --- a/boot.php +++ b/boot.php @@ -327,6 +327,8 @@ if (!defined('CURLE_OPERATION_TIMEDOUT')) { * * Useful in functions which require it but don't get it passed to them * + * @deprecated since version 2018.09 + * @see BaseObject::getApp() * @return App */ function get_app() @@ -457,7 +459,7 @@ function notice($s) return; } - $a = get_app(); + $a = \get_app(); if (empty($_SESSION['sysmsg'])) { $_SESSION['sysmsg'] = []; } @@ -475,7 +477,7 @@ function notice($s) */ function info($s) { - $a = get_app(); + $a = \get_app(); if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) { return; @@ -538,7 +540,7 @@ function feed_birthday($uid, $tz) */ function is_site_admin() { - $a = get_app(); + $a = \get_app(); $admin_email = Config::get('config', 'admin_email'); @@ -647,7 +649,7 @@ function get_server() function get_temppath() { - $a = get_app(); + $a = \get_app(); $temppath = Config::get("system", "temppath"); diff --git a/include/api.php b/include/api.php index ddcb8c8dcd..22ed066baf 100644 --- a/include/api.php +++ b/include/api.php @@ -430,7 +430,7 @@ function api_call(App $a) */ function api_error($type, $e) { - $a = get_app(); + $a = \get_app(); $error = ($e->getMessage() !== "" ? $e->getMessage() : $e->httpdesc); /// @TODO: https://dev.twitter.com/overview/api/response-codes @@ -963,7 +963,7 @@ function api_format_data($root_element, $type, $data) function api_account_verify_credentials($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -1027,7 +1027,7 @@ function requestdata($k) */ function api_statuses_mediap($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { Logger::log('api_statuses_update: no user'); @@ -1075,7 +1075,7 @@ api_register_func('api/statuses/mediap', 'api_statuses_mediap', true, API_METHOD */ function api_statuses_update($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { Logger::log('api_statuses_update: no user'); @@ -1217,7 +1217,7 @@ api_register_func('api/statuses/update_with_media', 'api_statuses_update', true, */ function api_media_upload() { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { Logger::log('no user'); @@ -1261,7 +1261,7 @@ api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST) */ function api_status_show($type, $item_id = 0) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); @@ -1360,7 +1360,7 @@ function api_status_show($type, $item_id = 0) */ function api_users_show($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); @@ -1436,7 +1436,7 @@ api_register_func('api/externalprofile/show', 'api_users_show'); */ function api_users_search($type) { - $a = get_app(); + $a = \get_app(); $userlist = []; @@ -1516,7 +1516,7 @@ api_register_func('api/users/lookup', 'api_users_lookup', true); */ function api_search($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -1577,7 +1577,7 @@ api_register_func('api/search', 'api_search', true); */ function api_statuses_home_timeline($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -1665,7 +1665,7 @@ api_register_func('api/statuses/friends_timeline', 'api_statuses_home_timeline', */ function api_statuses_public_timeline($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -1747,7 +1747,7 @@ api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline' */ function api_statuses_networkpublic_timeline($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -1802,7 +1802,7 @@ api_register_func('api/statuses/networkpublic_timeline', 'api_statuses_networkpu */ function api_statuses_show($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -1875,7 +1875,7 @@ api_register_func('api/statuses/show', 'api_statuses_show', true); */ function api_conversation_show($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -1954,7 +1954,7 @@ function api_statuses_repeat($type) { global $called_api; - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -2019,7 +2019,7 @@ api_register_func('api/statuses/retweet', 'api_statuses_repeat', true, API_METHO */ function api_statuses_destroy($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -2060,7 +2060,7 @@ api_register_func('api/statuses/destroy', 'api_statuses_destroy', true, API_METH */ function api_statuses_mentions($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -2128,7 +2128,7 @@ api_register_func('api/statuses/replies', 'api_statuses_mentions', true); */ function api_statuses_user_timeline($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -2206,7 +2206,7 @@ api_register_func('api/statuses/user_timeline', 'api_statuses_user_timeline', tr */ function api_favorites_create_destroy($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -2284,7 +2284,7 @@ function api_favorites($type) { global $called_api; - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -2737,7 +2737,7 @@ function api_contactlink_to_array($txt) */ function api_format_items_activities($item, $type = "json") { - $a = get_app(); + $a = \get_app(); $activities = [ 'like' => [], @@ -2859,7 +2859,7 @@ function api_format_items_profiles($profile_row) */ function api_format_items($r, $user_info, $filter_user = false, $type = "json") { - $a = get_app(); + $a = \get_app(); $ret = []; @@ -3049,7 +3049,7 @@ api_register_func('api/lists/subscriptions', 'api_lists_list', true); */ function api_lists_ownerships($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -3093,7 +3093,7 @@ api_register_func('api/lists/ownerships', 'api_lists_ownerships', true); */ function api_lists_statuses($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -3170,7 +3170,7 @@ api_register_func('api/lists/statuses', 'api_lists_statuses', true); */ function api_statuses_f($qtype) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -3346,7 +3346,7 @@ api_register_func('api/friendships/incoming', 'api_friendships_incoming', true); */ function api_statusnet_config($type) { - $a = get_app(); + $a = \get_app(); $name = Config::get('config', 'sitename'); $server = $a->getHostName(); @@ -3410,7 +3410,7 @@ function api_ff_ids($type) throw new ForbiddenException(); } - $a = get_app(); + $a = \get_app(); api_get_user($a); @@ -3478,7 +3478,7 @@ api_register_func('api/followers/ids', 'api_followers_ids', true); */ function api_direct_messages_new($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -3566,7 +3566,7 @@ api_register_func('api/direct_messages/new', 'api_direct_messages_new', true, AP */ function api_direct_messages_destroy($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -3724,7 +3724,7 @@ api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, AP */ function api_direct_messages_box($type, $box, $verbose) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); } @@ -4353,7 +4353,7 @@ function api_account_update_profile_image($type) Contact::updateSelfFromUserID(api_user(), true); // Update global directory in background - $url = System::baseUrl() . '/profile/' . get_app()->user['nickname']; + $url = System::baseUrl() . '/profile/' . \get_app()->user['nickname']; if ($url && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, "Directory", $url); } @@ -4668,7 +4668,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f */ function prepare_photo_data($type, $scale, $photo_id) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if ($user_info === false) { @@ -5209,7 +5209,7 @@ function api_best_nickname(&$contacts) */ function api_friendica_group_show($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5274,7 +5274,7 @@ api_register_func('api/friendica/group_show', 'api_friendica_group_show', true); */ function api_friendica_group_delete($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5336,7 +5336,7 @@ api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', tr */ function api_lists_destroy($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5452,7 +5452,7 @@ function group_create($name, $uid, $users = []) */ function api_friendica_group_create($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5481,7 +5481,7 @@ api_register_func('api/friendica/group_create', 'api_friendica_group_create', tr */ function api_lists_create($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5515,7 +5515,7 @@ api_register_func('api/lists/create', 'api_lists_create', true, API_METHOD_POST) */ function api_friendica_group_update($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5589,7 +5589,7 @@ api_register_func('api/friendica/group_update', 'api_friendica_group_update', tr */ function api_lists_update($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5635,7 +5635,7 @@ api_register_func('api/lists/update', 'api_lists_update', true, API_METHOD_POST) */ function api_friendica_activity($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5679,7 +5679,7 @@ api_register_func('api/friendica/activity/unattendmaybe', 'api_friendica_activit */ function api_friendica_notification($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5715,7 +5715,7 @@ function api_friendica_notification($type) */ function api_friendica_notification_seen($type) { - $a = get_app(); + $a = \get_app(); $user_info = api_get_user($a); if (api_user() === false || $user_info === false) { @@ -5760,7 +5760,7 @@ api_register_func('api/friendica/notification', 'api_friendica_notification', tr */ function api_friendica_direct_messages_setseen($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); } @@ -5809,7 +5809,7 @@ api_register_func('api/friendica/direct_messages_setseen', 'api_friendica_direct */ function api_friendica_direct_messages_search($type, $box = "") { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); @@ -5872,7 +5872,7 @@ api_register_func('api/friendica/direct_messages_search', 'api_friendica_direct_ */ function api_friendica_profile_show($type) { - $a = get_app(); + $a = \get_app(); if (api_user() === false) { throw new ForbiddenException(); diff --git a/include/enotify.php b/include/enotify.php index a4b0fd14b4..9edfaaca82 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -28,7 +28,7 @@ use Friendica\Util\Strings; */ function notification($params) { - $a = get_app(); + $a = \get_app(); // Temporary logging for finding the origin if (!isset($params['language']) || !isset($params['uid'])) { diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 64af908aa6..d5310f4577 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -72,7 +72,7 @@ function fbrowser_content(App $a) function _map_files1($rr) { - $a = get_app(); + $a = \get_app(); $types = Image::supportedTypes(); $ext = $types[$rr['type']]; $filename_e = $rr['filename']; @@ -116,7 +116,7 @@ function fbrowser_content(App $a) function _map_files2($rr) { - $a = get_app(); + $a = \get_app(); list($m1,$m2) = explode("/", $rr['filetype']); $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); $filename_e = $rr['filename']; diff --git a/mod/item.php b/mod/item.php index 02a61ebefc..4617dfa02e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -853,7 +853,7 @@ function item_post(App $a) { function item_post_return($baseurl, $api_source, $return_path) { // figure out how to return, depending on from whence we came - $a = get_app(); + $a = \get_app(); if ($api_source) { return; diff --git a/mod/lostpass.php b/mod/lostpass.php index 39209af951..3803ebeeef 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -127,7 +127,7 @@ function lostpass_form() function lostpass_generate_password($user) { $o = ''; - $a = get_app(); + $a = \get_app(); $new_password = User::generateNewPassword(); $result = User::updatePassword($user['uid'], $new_password); diff --git a/mod/message.php b/mod/message.php index 85ede744b9..3f1ec6a2e6 100644 --- a/mod/message.php +++ b/mod/message.php @@ -502,7 +502,7 @@ function get_messages($uid, $start, $limit) function render_messages(array $msg, $t) { - $a = get_app(); + $a = \get_app(); $tpl = Renderer::getMarkupTemplate($t); $rslt = ''; diff --git a/mod/nodeinfo.php b/mod/nodeinfo.php index d1df217040..edfdda8737 100644 --- a/mod/nodeinfo.php +++ b/mod/nodeinfo.php @@ -145,7 +145,7 @@ function nodeinfo_init(App $a) { function nodeinfo_cron() { - $a = get_app(); + $a = \get_app(); // If the addon 'statistics_json' is enabled then disable it and activate nodeinfo. if (Addon::isEnabled('statistics_json')) { diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php index 5d493db32c..7f9725b853 100644 --- a/mod/ostatus_subscribe.php +++ b/mod/ostatus_subscribe.php @@ -24,7 +24,7 @@ function ostatus_subscribe_content(App $a) $uid = local_user(); - $a = get_app(); + $a = \get_app(); $counter = intval($_REQUEST['counter']); diff --git a/mod/regmod.php b/mod/regmod.php index a772a78ce7..e03f28e85b 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -15,7 +15,7 @@ use Friendica\Module\Login; function user_allow($hash) { - $a = get_app(); + $a = \get_app(); $register = Register::getByHash($hash); if (!DBA::isResult($register)) { diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php index 3a3ce42067..5a6afd9fb4 100644 --- a/mod/repair_ostatus.php +++ b/mod/repair_ostatus.php @@ -22,7 +22,7 @@ function repair_ostatus_content(App $a) { $uid = local_user(); - $a = get_app(); + $a = \get_app(); $counter = intval($_REQUEST['counter']); diff --git a/mod/settings.php b/mod/settings.php index 1ec3725dc3..f60f9f5b5c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -30,7 +30,7 @@ use Friendica\Util\Temporal; function get_theme_config_file($theme) { - $a = get_app(); + $a = \get_app(); $base_theme = defaults($a->theme_info, 'extends'); if (file_exists("view/theme/$theme/config.php")) { diff --git a/src/BaseModule.php b/src/BaseModule.php index fe09693b3b..6c14d6ba77 100644 --- a/src/BaseModule.php +++ b/src/BaseModule.php @@ -88,7 +88,7 @@ abstract class BaseModule extends BaseObject */ public static function getFormSecurityToken($typename = '') { - $a = get_app(); + $a = \get_app(); $timestamp = time(); $sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename); @@ -116,7 +116,7 @@ abstract class BaseModule extends BaseObject $max_livetime = 10800; // 3 hours - $a = get_app(); + $a = \get_app(); $x = explode('.', $hash); if (time() > (IntVal($x[0]) + $max_livetime)) { @@ -136,7 +136,7 @@ abstract class BaseModule extends BaseObject public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token') { if (!self::checkFormSecurityToken($typename, $formname)) { - $a = get_app(); + $a = \get_app(); Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename); Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA); notice(self::getFormSecurityStandardErrorMessage()); @@ -147,7 +147,7 @@ abstract class BaseModule extends BaseObject public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token') { if (!self::checkFormSecurityToken($typename, $formname)) { - $a = get_app(); + $a = \get_app(); Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename); Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA); header('HTTP/1.1 403 Forbidden'); diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 243b2d949d..6aa76a55ac 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -56,7 +56,7 @@ class OEmbed { $embedurl = trim($embedurl, '\'"'); - $a = get_app(); + $a = \get_app(); $cache_key = 'oembed:' . $a->videowidth . ':' . $embedurl; @@ -364,7 +364,7 @@ class OEmbed */ private static function iframe($src, $width, $height) { - $a = get_app(); + $a = \get_app(); if (!$height || strstr($height, '%')) { $height = '200'; diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php index adfc60eae1..f7ac040eec 100644 --- a/src/Content/Text/HTML.php +++ b/src/Content/Text/HTML.php @@ -811,7 +811,7 @@ class HTML public static function contactBlock() { $o = ''; - $a = get_app(); + $a = \get_app(); $shown = PConfig::get($a->profile['uid'], 'system', 'display_friend_count', 24); if ($shown == 0) { diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 2a11cc5919..93206be5db 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -44,7 +44,7 @@ class Widget */ public static function findPeople() { - $a = get_app(); + $a = \get_app(); $global_dir = Config::get('system', 'directory'); if (Config::get('system', 'invitation_only')) { @@ -207,7 +207,7 @@ class Widget */ public static function categories($baseurl, $selected = '') { - $a = get_app(); + $a = \get_app(); if (!Feature::isEnabled($a->profile['profile_uid'], 'categories')) { return ''; @@ -316,7 +316,7 @@ class Widget */ public static function tagCloud($limit = 50) { - $a = get_app(); + $a = \get_app(); if (!$a->profile['profile_uid'] || !$a->profile['url']) { return ''; diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php index 7bfa73c607..8d9309a5bd 100644 --- a/src/Content/Widget/CalendarExport.php +++ b/src/Content/Widget/CalendarExport.php @@ -23,7 +23,7 @@ class CalendarExport * @return string Formated HTML of the calendar widget. */ public static function getHTML() { - $a = get_app(); + $a = \get_app(); if (empty($a->data['user'])) { return; diff --git a/src/Core/Console/DocBloxErrorChecker.php b/src/Core/Console/DocBloxErrorChecker.php index 224fe44fbf..506e48f0fd 100644 --- a/src/Core/Console/DocBloxErrorChecker.php +++ b/src/Core/Console/DocBloxErrorChecker.php @@ -59,7 +59,7 @@ HELP; throw new \RuntimeException('DocBlox isn\'t available.'); } - $dir = get_app()->getBasePath(); + $dir = \get_app()->getBasePath(); //stack for dirs to search $dirstack = []; diff --git a/src/Core/Console/GlobalCommunityBlock.php b/src/Core/Console/GlobalCommunityBlock.php index 2a19a9e7f3..d11aa6cf86 100644 --- a/src/Core/Console/GlobalCommunityBlock.php +++ b/src/Core/Console/GlobalCommunityBlock.php @@ -39,7 +39,7 @@ HELP; protected function doExecute() { - $a = get_app(); + $a = \get_app(); if ($this->getOption('v')) { $this->out('Class: ' . __CLASS__); diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php index a1753ede25..b0281241e3 100644 --- a/src/Core/Console/GlobalCommunitySilence.php +++ b/src/Core/Console/GlobalCommunitySilence.php @@ -47,7 +47,7 @@ HELP; protected function doExecute() { - $a = get_app(); + $a = \get_app(); if ($this->getOption('v')) { $this->out('Class: ' . __CLASS__); diff --git a/src/Core/Console/NewPassword.php b/src/Core/Console/NewPassword.php index 54d10af207..44cfc654e3 100644 --- a/src/Core/Console/NewPassword.php +++ b/src/Core/Console/NewPassword.php @@ -40,7 +40,7 @@ HELP; protected function doExecute() { - $a = get_app(); + $a = \get_app(); if ($this->getOption('v')) { $this->out('Class: ' . __CLASS__); diff --git a/src/Core/Console/PhpToPo.php b/src/Core/Console/PhpToPo.php index 4a3caf4bc2..a5b04e949a 100644 --- a/src/Core/Console/PhpToPo.php +++ b/src/Core/Console/PhpToPo.php @@ -51,7 +51,7 @@ HELP; throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); } - $a = get_app(); + $a = \get_app(); $phpfile = realpath($this->getArgument(0)); diff --git a/src/Core/Console/PoToPhp.php b/src/Core/Console/PoToPhp.php index de5c80878e..c492f7424c 100644 --- a/src/Core/Console/PoToPhp.php +++ b/src/Core/Console/PoToPhp.php @@ -47,7 +47,7 @@ HELP; throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); } - $a = get_app(); + $a = \get_app(); $pofile = realpath($this->getArgument(0)); diff --git a/src/Core/Console/Typo.php b/src/Core/Console/Typo.php index 832fdc2bde..82357b4753 100644 --- a/src/Core/Console/Typo.php +++ b/src/Core/Console/Typo.php @@ -41,7 +41,7 @@ HELP; throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); } - $a = get_app(); + $a = \get_app(); $php_path = $a->getConfigValue('config', 'php_path', 'php'); diff --git a/src/Core/Theme.php b/src/Core/Theme.php index 1524c29bac..bfff67058d 100644 --- a/src/Core/Theme.php +++ b/src/Core/Theme.php @@ -46,7 +46,7 @@ class Theme return $info; } - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); $theme_file = file_get_contents("view/theme/$theme/theme.php"); $a->saveTimestamp($stamp1, "file"); @@ -155,13 +155,13 @@ class Theme if ($root !== '' && $root[strlen($root) - 1] !== '/') { $root = $root . '/'; } - $theme_info = get_app()->theme_info; + $theme_info = \get_app()->theme_info; if (is_array($theme_info) && array_key_exists('extends', $theme_info)) { $parent = $theme_info['extends']; } else { $parent = 'NOPATH'; } - $theme = get_app()->getCurrentTheme(); + $theme = \get_app()->getCurrentTheme(); $thname = $theme; $ext = substr($file, strrpos($file, '.') + 1); $paths = [ @@ -191,7 +191,7 @@ class Theme */ public static function getStylesheetPath($theme) { - $a = get_app(); + $a = \get_app(); $opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : ''); if (file_exists('view/theme/' . $theme . '/style.php')) { diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 2c811e3bda..3a4be04381 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -35,7 +35,7 @@ class Worker */ public static function processQueue($run_cron = true) { - $a = get_app(); + $a = \get_app(); self::$up_start = microtime(true); @@ -206,7 +206,7 @@ class Worker */ public static function execute($queue) { - $a = get_app(); + $a = \get_app(); $mypid = getmypid(); @@ -319,7 +319,7 @@ class Worker */ private static function execFunction($queue, $funcname, $argv, $method_call) { - $a = get_app(); + $a = \get_app(); $mypid = getmypid(); diff --git a/src/Database/DBA.php b/src/Database/DBA.php index f1c0ead6af..15a6e4dbab 100644 --- a/src/Database/DBA.php +++ b/src/Database/DBA.php @@ -208,7 +208,7 @@ class DBA * @param string $query The database query that will be analyzed */ private static function logIndex($query) { - $a = get_app(); + $a = \get_app(); if (!$a->getConfigVariable('system', 'db_log_index')) { return; @@ -388,7 +388,7 @@ class DBA * @return bool|object statement object or result object */ public static function p($sql) { - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); @@ -606,7 +606,7 @@ class DBA * @return boolean Was the query successfull? False is returned only if an error occurred */ public static function e($sql) { - $a = get_app(); + $a = \get_app(); $stamp = microtime(true); @@ -770,7 +770,7 @@ class DBA * @return array current row */ public static function fetch($stmt) { - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); @@ -1518,7 +1518,7 @@ class DBA * @return boolean was the close successful? */ public static function close($stmt) { - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 25434e25a0..669b1ac25f 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -909,7 +909,7 @@ class Contact extends BaseObject public static function photoMenu(array $contact, $uid = 0) { // @todo Unused, to be removed - $a = get_app(); + $a = \get_app(); $contact_url = ''; $pm_url = ''; @@ -1631,7 +1631,7 @@ class Contact extends BaseObject { $result = ['cid' => -1, 'success' => false, 'message' => '']; - $a = get_app(); + $a = \get_app(); // remove ajax junk, e.g. Twitter $url = str_replace('/#!/', '/', $url); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index c3d58aae74..337a938a74 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -518,7 +518,7 @@ class GContact */ public static function updateSuggestions() { - $a = get_app(); + $a = \get_app(); $done = []; diff --git a/src/Model/Item.php b/src/Model/Item.php index 939ee43bf4..ca6556d275 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1148,7 +1148,7 @@ class Item extends BaseObject if ($notify) { // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri. // We add the hash of our own host because our host is the original creator of the post. - $prefix_host = get_app()->getHostName(); + $prefix_host = \get_app()->getHostName(); } else { $prefix_host = ''; @@ -1238,7 +1238,7 @@ class Item extends BaseObject public static function insert($item, $force_parent = false, $notify = false, $dontcache = false) { - $a = get_app(); + $a = \get_app(); // If it is a posting where users should get notifications, then define it as wall posting if ($notify) { @@ -2611,7 +2611,7 @@ class Item extends BaseObject public static function isRemoteSelf($contact, &$datarray) { - $a = get_app(); + $a = \get_app(); if (!$contact['remote_self']) { return false; diff --git a/src/Model/Mail.php b/src/Model/Mail.php index ec02311078..deedadeb0f 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -28,7 +28,7 @@ class Mail */ public static function send($recipient = 0, $body = '', $subject = '', $replyto = '') { - $a = get_app(); + $a = \get_app(); if (!$recipient) { return -1; diff --git a/src/Model/Photo.php b/src/Model/Photo.php index 4a9e11c554..ca909a41cc 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -144,7 +144,7 @@ class Photo $micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $Image->getExt() . $suffix; // Remove the cached photo - $a = get_app(); + $a = \get_app(); $basepath = $a->getBasePath(); if (is_dir($basepath . "/photo")) { diff --git a/src/Model/Profile.php b/src/Model/Profile.php index bd455bc6ba..36840c17fa 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -280,7 +280,7 @@ class Profile */ private static function sidebar($profile, $block = 0, $show_connect = true) { - $a = get_app(); + $a = \get_app(); $o = ''; $location = false; @@ -551,7 +551,7 @@ class Profile public static function getBirthdays() { - $a = get_app(); + $a = \get_app(); $o = ''; if (!local_user() || $a->is_mobile || $a->is_tablet) { @@ -649,7 +649,7 @@ class Profile public static function getEventsReminderHTML() { - $a = get_app(); + $a = \get_app(); $o = ''; if (!local_user() || $a->is_mobile || $a->is_tablet) { @@ -1090,7 +1090,7 @@ class Profile */ public static function openWebAuthInit($token) { - $a = get_app(); + $a = \get_app(); // Clean old OpenWebAuthToken entries. OpenWebAuthToken::purge('owt', '3 MINUTE'); diff --git a/src/Model/User.php b/src/Model/User.php index c71ae475e9..49a486cba2 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -406,7 +406,7 @@ class User */ public static function create(array $data) { - $a = get_app(); + $a = \get_app(); $return = ['user' => null, 'password' => '']; $using_invites = Config::get('system', 'invitation_only'); @@ -795,7 +795,7 @@ class User return false; } - $a = get_app(); + $a = \get_app(); Logger::log('Removing user: ' . $uid); diff --git a/src/Network/FKOAuth1.php b/src/Network/FKOAuth1.php index 51a558942d..43ef1257c5 100644 --- a/src/Network/FKOAuth1.php +++ b/src/Network/FKOAuth1.php @@ -36,7 +36,7 @@ class FKOAuth1 extends OAuthServer public function loginUser($uid) { Logger::log("FKOAuth1::loginUser $uid"); - $a = get_app(); + $a = \get_app(); $record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]); if (!DBA::isResult($record)) { diff --git a/src/Network/Probe.php b/src/Network/Probe.php index f61eed4192..d322c3ed27 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -74,7 +74,7 @@ class Probe */ private static function ownHost($host) { - $own_host = get_app()->getHostName(); + $own_host = \get_app()->getHostName(); $parts = parse_url($host); diff --git a/src/Object/Image.php b/src/Object/Image.php index abce69a1c7..298a449b3d 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -652,7 +652,7 @@ class Image $string = $this->asString(); - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); file_put_contents($path, $string); @@ -730,7 +730,7 @@ class Image Logger::log('Image: guessType: '.$filename . ($fromcurl?' from curl headers':''), Logger::DEBUG); $type = null; if ($fromcurl) { - $a = get_app(); + $a = \get_app(); $headers=[]; $h = explode("\n", $header); foreach ($h as $l) { @@ -798,7 +798,7 @@ class Image } else { $tempfile = tempnam(get_temppath(), "cache"); - $a = get_app(); + $a = \get_app(); $stamp1 = microtime(true); file_put_contents($tempfile, $img_str); $a->saveTimestamp($stamp1, "file"); diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index f8405ee92b..5933ccf289 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -137,7 +137,7 @@ class DFRN */ public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) { - $a = get_app(); + $a = \get_app(); $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic $public_feed = (($dfrn_id) ? false : true); @@ -1160,7 +1160,7 @@ class DFRN */ public static function deliver($owner, $contact, $atom, $dissolve = false, $legacy_transport = false) { - $a = get_app(); + $a = \get_app(); // At first try the Diaspora transport layer if (!$dissolve && !$legacy_transport) { @@ -1420,7 +1420,7 @@ class DFRN */ public static function transmit($owner, $contact, $atom, $public_batch = false) { - $a = get_app(); + $a = \get_app(); if (!$public_batch) { if (empty($contact['addr'])) { @@ -1894,7 +1894,7 @@ class DFRN */ private static function processSuggestion($xpath, $suggestion, $importer) { - $a = get_app(); + $a = \get_app(); Logger::log("Processing suggestions"); @@ -2457,7 +2457,7 @@ class DFRN /// @todo Do we really need this check for HTML elements? (It was copied from the old function) if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) { - $base_url = get_app()->getBaseURL(); + $base_url = \get_app()->getBaseURL(); $item['body'] = HTML::relToAbs($item['body'], $base_url); $item['body'] = HTML::toBBCodeVideo($item['body']); diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index b4e494121a..95085c4e75 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -2305,7 +2305,7 @@ class Diaspora */ private static function receiveRequestMakeFriend(array $importer, array $contact) { - $a = get_app(); + $a = \get_app(); if ($contact["rel"] == Contact::SHARING) { DBA::update( @@ -3064,7 +3064,7 @@ class Diaspora */ public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false) { - $a = get_app(); + $a = \get_app(); $enabled = intval(Config::get("system", "diaspora_enabled")); if (!$enabled) { diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index 67e5412e25..91341328a1 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -35,7 +35,7 @@ class Feed { */ public static function import($xml, $importer, &$contact, &$hub, $simulate = false) { - $a = get_app(); + $a = \get_app(); if (!$simulate) { Logger::log("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], Logger::DEBUG); diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 1a6f748d16..79fb94cf8a 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1266,7 +1266,7 @@ class OStatus */ private static function addHeader(DOMDocument $doc, array $owner, $filter, $feed_mode = false) { - $a = get_app(); + $a = \get_app(); $root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed'); $doc->appendChild($root); diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index 3300b1d7ab..c61fe128a1 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -63,7 +63,7 @@ class PortableContact */ public static function load($cid, $uid, $zcid, $url) { - $a = get_app(); + $a = \get_app(); if ($cid) { if (!$url || !$uid) { diff --git a/src/Render/FriendicaSmarty.php b/src/Render/FriendicaSmarty.php index 413d746dcf..deabd3baf2 100644 --- a/src/Render/FriendicaSmarty.php +++ b/src/Render/FriendicaSmarty.php @@ -22,7 +22,7 @@ class FriendicaSmarty extends Smarty { parent::__construct(); - $a = get_app(); + $a = \get_app(); $theme = $a->getCurrentTheme(); // setTemplateDir can be set to an array, which Smarty will parse in order. diff --git a/src/Render/FriendicaSmartyEngine.php b/src/Render/FriendicaSmartyEngine.php index 2b6d7a877b..de078d233c 100644 --- a/src/Render/FriendicaSmartyEngine.php +++ b/src/Render/FriendicaSmartyEngine.php @@ -32,7 +32,7 @@ class FriendicaSmartyEngine implements ITemplateEngine $s = new FriendicaSmarty(); } - $r['$APP'] = get_app(); + $r['$APP'] = \get_app(); // "middleware": inject variables into templates $arr = [ @@ -54,7 +54,7 @@ class FriendicaSmartyEngine implements ITemplateEngine public function getTemplateFile($file, $root = '') { - $a = get_app(); + $a = \get_app(); $template = new FriendicaSmarty(); // Make sure $root ends with a slash / diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php index aa163f6a9e..28157c23ef 100644 --- a/src/Util/ExAuth.php +++ b/src/Util/ExAuth.php @@ -122,7 +122,7 @@ class ExAuth */ private function isUser(array $aCommand) { - $a = get_app(); + $a = \get_app(); // Check if there is a username if (!isset($aCommand[1])) { @@ -202,7 +202,7 @@ class ExAuth */ private function auth(array $aCommand) { - $a = get_app(); + $a = \get_app(); // check user authentication if (sizeof($aCommand) != 4) { diff --git a/src/Util/Network.php b/src/Util/Network.php index ab0958d642..0acad3e082 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -94,7 +94,7 @@ class Network $stamp1 = microtime(true); - $a = get_app(); + $a = \get_app(); $parts = parse_url($url); $path_parts = explode('/', defaults($parts, 'path', '')); @@ -251,7 +251,7 @@ class Network return CurlResult::createErrorCurl($url); } - $a = get_app(); + $a = \get_app(); $ch = curl_init($url); if (($redirects > 8) || (!$ch)) { @@ -604,7 +604,7 @@ class Network */ public static function finalUrl($url, $depth = 1, $fetchbody = false) { - $a = get_app(); + $a = \get_app(); $url = self::stripTrackingQueryParams($url); diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php index 062a809b6a..70c5279cc8 100644 --- a/src/Util/ParseUrl.php +++ b/src/Util/ParseUrl.php @@ -111,7 +111,7 @@ class ParseUrl */ public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) { - $a = get_app(); + $a = \get_app(); $siteinfo = []; diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php index d121d59770..b6392d72fc 100644 --- a/src/Util/Temporal.php +++ b/src/Util/Temporal.php @@ -126,7 +126,7 @@ class Temporal */ public static function getDateofBirthField($dob) { - $a = get_app(); + $a = \get_app(); list($year, $month, $day) = sscanf($dob, '%4d-%2d-%2d'); diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php index 91b41e01a2..e4e654f464 100644 --- a/tests/include/ApiTest.php +++ b/tests/include/ApiTest.php @@ -1242,7 +1242,7 @@ class ApiTest extends DatabaseTest 'type' => 'image/png' ] ]; - $app = get_app(); + $app = \get_app(); $app->argc = 2; $result = api_media_upload(); diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php index ddce673105..2f09180439 100644 --- a/view/theme/frio/php/scheme.php +++ b/view/theme/frio/php/scheme.php @@ -21,7 +21,7 @@ use Friendica\Core\PConfig; function get_scheme_info($scheme) { - $theme = get_app()->getCurrentTheme(); + $theme = \get_app()->getCurrentTheme(); $themepath = 'view/theme/' . $theme . '/'; $scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme')); diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php index 6168932e95..9dd958fff4 100644 --- a/view/theme/smoothly/theme.php +++ b/view/theme/smoothly/theme.php @@ -107,7 +107,7 @@ if (! function_exists('_js_in_foot')) { function _js_in_foot() { /** @purpose insert stuff in bottom of page */ - $a = get_app(); + $a = \get_app(); $ssl_state = null; $baseurl = System::baseUrl($ssl_state); $bottom['$baseurl'] = $baseurl; diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index 89fea650ba..b9684ad875 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -129,7 +129,7 @@ function get_vier_config($key, $default = false, $admin = false) function vier_community_info() { - $a = get_app(); + $a = \get_app(); $show_pages = get_vier_config("show_pages", 1); $show_profiles = get_vier_config("show_profiles", 1);