From 3f3422975266835fc125d1d61aae85ccc10d96d9 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 30 Dec 2019 23:00:08 +0100 Subject: [PATCH 1/4] Move redundant System::baseUrl() to DI::baseUrl() calls --- include/api.php | 38 ++++++------ include/conversation.php | 8 +-- include/enotify.php | 10 ++-- include/items.php | 7 +-- mod/cal.php | 7 +-- mod/dfrn_confirm.php | 6 +- mod/dfrn_request.php | 8 +-- mod/display.php | 13 ++--- mod/events.php | 11 ++-- mod/fbrowser.php | 7 +-- mod/follow.php | 2 +- mod/item.php | 16 ++--- mod/lostpass.php | 9 ++- mod/match.php | 6 +- mod/message.php | 14 ++--- mod/msearch.php | 6 +- mod/noscrape.php | 7 +-- mod/oexchange.php | 6 +- mod/ostatus_subscribe.php | 5 +- mod/photos.php | 20 +++---- mod/ping.php | 10 ++-- mod/poke.php | 2 +- mod/profile_photo.php | 9 ++- mod/profiles.php | 5 +- mod/pubsubhubbub.php | 4 +- mod/redir.php | 2 +- mod/regmod.php | 3 +- mod/repair_ostatus.php | 5 +- mod/settings.php | 13 ++--- mod/subthread.php | 5 +- mod/suggest.php | 5 +- mod/tagger.php | 7 ++- mod/unfollow.php | 3 +- mod/videos.php | 13 ++--- mod/wall_upload.php | 10 ++-- mod/wallmessage.php | 3 +- src/App/BaseURL.php | 8 +++ src/Content/Nav.php | 3 +- src/Content/OEmbed.php | 4 +- src/Content/Smilies.php | 74 ++++++++++++------------ src/Content/Text/BBCode.php | 22 +++---- src/Content/Widget.php | 4 +- src/Core/System.php | 11 ---- src/Core/Theme.php | 4 +- src/Core/UserImport.php | 2 +- src/Core/Worker.php | 2 +- src/Model/Contact.php | 68 +++++++++++----------- src/Model/Event.php | 7 ++- src/Model/GContact.php | 12 ++-- src/Model/Item.php | 14 ++--- src/Model/Mail.php | 7 ++- src/Model/Photo.php | 14 ++--- src/Model/Profile.php | 24 ++++---- src/Model/Term.php | 6 +- src/Model/User.php | 10 ++-- src/Module/Contact.php | 3 +- src/Module/Objects.php | 3 +- src/Module/Profile.php | 20 +++---- src/Module/Settings/Delegation.php | 7 +-- src/Module/Settings/UserExport.php | 5 +- src/Module/Tos.php | 5 +- src/Network/Probe.php | 3 +- src/Protocol/ActivityPub/Transmitter.php | 58 +++++++++---------- src/Protocol/DFRN.php | 27 +++++---- src/Protocol/Diaspora.php | 15 +++-- src/Protocol/Feed.php | 4 +- src/Protocol/OStatus.php | 23 ++++---- src/Util/Network.php | 2 +- src/Util/Proxy.php | 11 ++-- src/Worker/Delivery.php | 3 +- src/Worker/PubSubPublish.php | 5 +- tests/include/ApiTest.php | 4 +- view/php/default.php | 2 +- view/php/minimal.php | 2 +- view/theme/frio/php/default.php | 2 +- view/theme/frio/php/minimal.php | 60 +++++++++---------- view/theme/frio/php/standard.php | 4 +- view/theme/quattro/theme.php | 5 +- view/theme/smoothly/php/default.php | 2 +- view/theme/smoothly/theme.php | 5 +- view/theme/vier/theme.php | 2 +- 81 files changed, 418 insertions(+), 465 deletions(-) diff --git a/include/api.php b/include/api.php index 048d07d0a2..a6a6b50500 100644 --- a/include/api.php +++ b/include/api.php @@ -130,7 +130,7 @@ function api_date($str) * * @brief Register API endpoint * - * @param string $path API URL path, relative to System::baseUrl() + * @param string $path API URL path, relative to DI::baseUrl() * @param string $func Function name to call on path request * @param bool $auth API need logged user * @param string $method HTTP method reqiured to call this endpoint. @@ -438,12 +438,12 @@ function api_rss_extra(App $a, $arr, $user_info) $arr['$user'] = $user_info; $arr['$rss'] = [ 'alternate' => $user_info['url'], - 'self' => System::baseUrl() . "/" . DI::args()->getQueryString(), - 'base' => System::baseUrl(), + 'self' => DI::baseUrl() . "/" . DI::args()->getQueryString(), + 'base' => DI::baseUrl(), 'updated' => api_date(null), 'atom_updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM), 'language' => $user_info['lang'], - 'logo' => System::baseUrl() . "/images/friendica-32.png", + 'logo' => DI::baseUrl() . "/images/friendica-32.png", ]; return $arr; @@ -714,7 +714,7 @@ function api_get_user(App $a, $contact_id = null) 'statusnet_blocking' => false, 'notifications' => false, /// @TODO old way? - //'statusnet_profile_url' => System::baseUrl()."/contact/".$uinfo[0]['cid'], + //'statusnet_profile_url' => DI::baseUrl()."/contact/".$uinfo[0]['cid'], 'statusnet_profile_url' => $uinfo[0]['url'], 'uid' => intval($uinfo[0]['uid']), 'cid' => intval($uinfo[0]['cid']), @@ -1164,8 +1164,8 @@ function api_statuses_update($type) $phototypes = Images::supportedTypes(); $ext = $phototypes[$r[0]['type']]; $description = $r[0]['desc'] ?? ''; - $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']'; - $_REQUEST['body'] .= '[img=' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . ']' . $description . '[/img][/url]'; + $_REQUEST['body'] .= "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']'; + $_REQUEST['body'] .= '[img=' . DI::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . ']' . $description . '[/img][/url]'; } } } @@ -2786,7 +2786,7 @@ function api_format_items_embeded_images($item, $text) $text = preg_replace_callback( '|data:image/([^;]+)[^=]+=*|m', function () use ($item) { - return System::baseUrl() . '/display/' . $item['guid']; + return DI::baseUrl() . '/display/' . $item['guid']; }, $text ); @@ -3041,7 +3041,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use //'entities' => NULL, 'statusnet_html' => $converted["html"], 'statusnet_conversation_id' => $item['parent'], - 'external_url' => System::baseUrl() . "/display/" . $item['guid'], + 'external_url' => DI::baseUrl() . "/display/" . $item['guid'], 'friendica_activities' => api_format_items_activities($item, $type), 'friendica_title' => $item['title'], 'friendica_html' => BBCode::convert($item['body'], false) @@ -3569,13 +3569,13 @@ function api_statusnet_config($type) { $name = Config::get('config', 'sitename'); $server = DI::baseUrl()->getHostname(); - $logo = System::baseUrl() . '/images/friendica-64.png'; + $logo = DI::baseUrl() . '/images/friendica-64.png'; $email = Config::get('config', 'admin_email'); $closed = intval(Config::get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 'true' : 'false'; $private = Config::get('system', 'block_public') ? 'true' : 'false'; $textlimit = (string) Config::get('config', 'api_import_size', Config::get('config', 'max_import_size', 200000)); $ssl = Config::get('system', 'have_ssl') ? 'true' : 'false'; - $sslserver = Config::get('system', 'have_ssl') ? str_replace('http:', 'https:', System::baseUrl()) : ''; + $sslserver = Config::get('system', 'have_ssl') ? str_replace('http:', 'https:', DI::baseUrl()) : ''; $config = [ 'site' => ['name' => $name,'server' => $server, 'theme' => 'default', 'path' => '', @@ -4313,7 +4313,7 @@ function api_fr_photos_list($type) $photo['album'] = $rr['album']; $photo['filename'] = $rr['filename']; $photo['type'] = $rr['type']; - $thumb = System::baseUrl() . "/photo/" . $rr['resource-id'] . "-" . $rr['scale'] . "." . $typetoext[$rr['type']]; + $thumb = DI::baseUrl() . "/photo/" . $rr['resource-id'] . "-" . $rr['scale'] . "." . $typetoext[$rr['type']]; $photo['created'] = $rr['created']; $photo['edited'] = $rr['edited']; $photo['desc'] = $rr['desc']; @@ -4619,15 +4619,15 @@ function api_account_update_profile_image($type) $condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], api_user()]; Photo::update(['profile' => false], $condition); } else { - $fields = ['photo' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext, - 'thumb' => System::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext]; + $fields = ['photo' => DI::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext, + 'thumb' => DI::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext]; DBA::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]); } Contact::updateSelfFromUserID(api_user(), true); // Update global directory in background - $url = System::baseUrl() . '/profile/' . \get_app()->user['nickname']; + $url = DI::baseUrl() . '/profile/' . \get_app()->user['nickname']; if ($url && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, "Directory", $url); } @@ -4939,8 +4939,8 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f ]; // adds link to the thumbnail scale photo - $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nick'] . '/image/' . $hash . ']' - . '[img]' . System::baseUrl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]' + $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nick'] . '/image/' . $hash . ']' + . '[img]' . DI::baseUrl() . '/photo/' . $hash . '-' . "2" . '.'. $typetoext[$filetype] . '[/img]' . '[/url]'; // do the magic for storing the item in the database and trigger the federation to other contacts @@ -5008,14 +5008,14 @@ function prepare_photo_data($type, $scale, $photo_id) for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) { $data['photo']['links'][$k . ":link"]["@attributes"] = ["type" => $data['photo']['type'], "scale" => $k, - "href" => System::baseUrl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]]; + "href" => DI::baseUrl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]]; } } else { $data['photo']['link'] = []; // when we have profile images we could have only scales from 4 to 6, but index of array always needs to start with 0 $i = 0; for ($k = intval($data['photo']['minscale']); $k <= intval($data['photo']['maxscale']); $k++) { - $data['photo']['link'][$i] = System::baseUrl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]; + $data['photo']['link'][$i] = DI::baseUrl() . "/photo/" . $data['photo']['resource-id'] . "-" . $k . "." . $typetoext[$data['photo']['type']]; $i++; } } diff --git a/include/conversation.php b/include/conversation.php index 6ded55eec6..cc191ef61f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -86,7 +86,7 @@ function item_redir_and_replace_images($body, $images, $cid) { while ($pos !== false && $cnt < 1000) { $search = '/\[url\=(.*?)\]\[!#saved_image([0-9]*)#!\]\[\/url\]' . '/is'; - $replace = '[url=' . System::baseUrl() . '/redir/' . $cid + $replace = '[url=' . DI::baseUrl() . '/redir/' . $cid . '?f=1&url=' . '$1' . '][!#saved_image' . '$2' .'#!][/url]'; $newbody .= substr($origbody, 0, $pos['start']['open']); @@ -779,7 +779,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ } $o = Renderer::replaceMacros($page_template, [ - '$baseurl' => System::baseUrl($ssl_state), + '$baseurl' => DI::baseUrl()->get($ssl_state), '$return_path' => DI::args()->getQueryString(), '$live_update' => $live_update_div, '$remove' => L10n::t('remove'), @@ -1173,7 +1173,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) $tpl = Renderer::getMarkupTemplate('jot-header.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$newpost' => 'true', - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$geotag' => $geotag, '$nickname' => $x['nickname'], '$ispublic' => L10n::t('Visible to everybody'), @@ -1244,7 +1244,7 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) '$posttype' => $notes_cid ? Item::PT_PERSONAL_NOTE : Item::PT_ARTICLE, '$content' => $x['content'] ?? '', '$post_id' => $x['post_id'] ?? '', - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$defloc' => $x['default_location'], '$visitor' => $x['visitor'], '$pvisit' => $notes_cid ? 'none' : $x['visitor'], diff --git a/include/enotify.php b/include/enotify.php index 24f4429f67..cc465dc129 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -59,7 +59,7 @@ function notification($params) $banner = $l10n->t('Friendica Notification'); $product = FRIENDICA_PLATFORM; - $siteurl = System::baseUrl(true); + $siteurl = DI::baseUrl(true); $thanks = $l10n->t('Thank You,'); $sitename = Config::get('config', 'sitename'); if (Config::get('config', 'admin_name')) { @@ -101,7 +101,7 @@ function notification($params) $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".System::baseUrl()."/notifications/system>\n"; + $additional_mail_header .= "List-Archive: <".DI::baseUrl()."/notifications/system>\n"; if (array_key_exists('item', $params)) { $title = $params['item']['title']; @@ -536,7 +536,7 @@ function notification($params) $notify_id = DBA::lastInsertId(); - $itemlink = System::baseUrl().'/notify/view/'.$notify_id; + $itemlink = DI::baseUrl().'/notify/view/'.$notify_id; $msg = Renderer::replaceMacros($epreamble, ['$itemlink' => $itemlink]); $msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg))); @@ -714,7 +714,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $profiles[] = $owner["url"]; // Notifications from Diaspora are often with an URL in the Diaspora format - $profiles[] = System::baseUrl()."/u/".$user["nickname"]; + $profiles[] = DI::baseUrl()."/u/".$user["nickname"]; $profiles2 = []; @@ -764,7 +764,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") { $params["uid"] = $uid; $params["item"] = $item; $params["parent"] = $item["parent"]; - $params["link"] = System::baseUrl().'/display/'.urlencode($item["guid"]); + $params["link"] = DI::baseUrl().'/display/'.urlencode($item["guid"]); $params["otype"] = 'item'; $params["source_name"] = $item["author-name"]; $params["source_link"] = $item["author-link"]; diff --git a/include/items.php b/include/items.php index 8dd6793d2c..d1f0ba8787 100644 --- a/include/items.php +++ b/include/items.php @@ -9,7 +9,6 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; @@ -92,7 +91,7 @@ function add_page_info_data(array $data, $no_photos = false) /// @TODO make a positive list of allowed characters $hashtag = str_replace([" ", "+", "/", ".", "#", "'", "’", "`", "(", ")", "„", "“"], ["", "", "", "", "", "", "", "", "", "", "", ""], $keyword); - $hashtags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] "; + $hashtags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url] "; } } @@ -143,7 +142,7 @@ function add_page_keywords($url, $photo = "", $keywords = false, $keyword_blackl $tags .= ", "; } - $tags .= "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]"; + $tags .= "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]"; } } @@ -298,7 +297,7 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub return; } - $push_url = System::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id']; + $push_url = DI::baseUrl() . '/pubsub/' . $user['nickname'] . '/' . $contact['id']; // Use a single verify token, even if multiple hubs $verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : Strings::getRandomHex()); diff --git a/mod/cal.php b/mod/cal.php index f7fe2435d0..c388e95215 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -13,7 +13,6 @@ use Friendica\Content\Widget; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; @@ -221,7 +220,7 @@ function cal_content(App $a) foreach ($r as $rr) { $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'); if (empty($links[$j])) { - $links[$j] = System::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j; + $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j; } } } @@ -259,8 +258,8 @@ function cal_content(App $a) '$tabs' => $tabs, '$title' => L10n::t('Events'), '$view' => L10n::t('View'), - '$previous' => [System::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''], - '$next' => [System::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''], + '$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''], + '$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''], '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'), '$events' => $events, "today" => L10n::t("today"), diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index d9ba9dfac5..b14cba32a4 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -177,7 +177,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) $params['dfrn_id'] = bin2hex($result); $params['public_key'] = $public_key; - $my_url = System::baseUrl() . '/profile/' . $user['nickname']; + $my_url = DI::baseUrl() . '/profile/' . $user['nickname']; openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); $params['source_url'] = bin2hex($params['source_url']); @@ -469,7 +469,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) if (DBA::isResult($contact)) { $photo = $contact['photo']; } else { - $photo = System::baseUrl() . '/images/person-300.jpg'; + $photo = DI::baseUrl() . '/images/person-300.jpg'; } Contact::updateAvatar($photo, $local_uid, $dfrn_record); @@ -536,7 +536,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) 'to_name' => $combined['username'], 'to_email' => $combined['email'], 'uid' => $combined['uid'], - 'link' => System::baseUrl() . '/contact/' . $dfrn_record, + 'link' => DI::baseUrl() . '/contact/' . $dfrn_record, 'source_name' => ((strlen(stripslashes($combined['name']))) ? stripslashes($combined['name']) : L10n::t('[Name Withheld]')), 'source_link' => $combined['url'], 'source_photo' => $combined['photo'], diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 7f0ad805a7..38a3f310ac 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -559,7 +559,7 @@ function dfrn_request_content(App $a) 'to_name' => $r[0]['username'], 'to_email' => $r[0]['email'], 'uid' => $r[0]['uid'], - 'link' => System::baseUrl() . '/notifications/intros', + 'link' => DI::baseUrl() . '/notifications/intros', 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')), 'source_link' => $r[0]['url'], 'source_photo' => $r[0]['photo'], @@ -611,16 +611,16 @@ function dfrn_request_content(App $a) $myaddr = $_GET['address']; } elseif (local_user()) { if (strlen(DI::baseUrl()->getUrlPath())) { - $myaddr = System::baseUrl() . '/profile/' . $a->user['nickname']; + $myaddr = DI::baseUrl() . '/profile/' . $a->user['nickname']; } else { - $myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $myaddr = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); } } else { // last, try a zrl $myaddr = Profile::getMyURL(); } - $target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $target_addr = $a->profile['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); /* The auto_request form only has the profile address * because nobody is going to read the comments and diff --git a/mod/display.php b/mod/display.php index f4274caeae..83e3f63ba2 100644 --- a/mod/display.php +++ b/mod/display.php @@ -18,7 +18,6 @@ use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Profile; use Friendica\Module\Objects; @@ -100,8 +99,8 @@ function display_init(App $a) $profiledata = display_fetchauthor($a, $item); - if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(System::baseUrl()))) { - $nickname = str_replace(Strings::normaliseLink(System::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"])); + if (strstr(Strings::normaliseLink($profiledata["url"]), Strings::normaliseLink(DI::baseUrl()))) { + $nickname = str_replace(Strings::normaliseLink(DI::baseUrl())."/profile/", "", Strings::normaliseLink($profiledata["url"])); if ($nickname != $a->user["nickname"]) { $profile = DBA::fetchFirst("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` @@ -232,8 +231,8 @@ function display_content(App $a, $update = false, $update_uid = 0) $is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]); if ($is_public) { // For the atom feed the nickname doesn't matter at all, we only need the item id. - $alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom'; - $conversation = System::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom'; + $alternate = DI::baseUrl().'/display/feed-item/'.$item_id.'.atom'; + $conversation = DI::baseUrl().'/display/feed-item/'.$item_parent.'/conversation.atom'; } else { $alternate = ''; $conversation = ''; @@ -363,7 +362,7 @@ function display_content(App $a, $update = false, $update_uid = 0) $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; - $page['htmlhead'] .= ''."\n"; + $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; // Dublin Core @@ -373,7 +372,7 @@ function display_content(App $a, $update = false, $update_uid = 0) // Open Graph $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; - $page['htmlhead'] .= ''."\n"; + $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; $page['htmlhead'] .= ''."\n"; diff --git a/mod/events.php b/mod/events.php index 8984e99561..d6701ce448 100644 --- a/mod/events.php +++ b/mod/events.php @@ -11,7 +11,6 @@ use Friendica\Core\ACL; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBA; @@ -348,7 +347,7 @@ function events_content(App $a) foreach ($r as $rr) { $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j'); if (empty($links[$j])) { - $links[$j] = System::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j; + $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j; } } } @@ -393,9 +392,9 @@ function events_content(App $a) '$tabs' => $tabs, '$title' => L10n::t('Events'), '$view' => L10n::t('View'), - '$new_event' => [System::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''], - '$previous' => [System::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''], - '$next' => [System::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''], + '$new_event' => [DI::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''], + '$previous' => [DI::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''], + '$next' => [DI::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''], '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'), '$events' => $events, @@ -504,7 +503,7 @@ function events_content(App $a) $tpl = Renderer::getMarkupTemplate('event_form.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$post' => System::baseUrl() . '/events', + '$post' => DI::baseUrl() . '/events', '$eid' => $eid, '$cid' => $cid, '$uri' => $uri, diff --git a/mod/fbrowser.php b/mod/fbrowser.php index b6df3304d4..b1daa2cc23 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -8,7 +8,6 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Util\Images; use Friendica\Util\Strings; @@ -93,9 +92,9 @@ function fbrowser_content(App $a) } return [ - System::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'], + DI::baseUrl() . '/photos/' . $a->user['nickname'] . '/image/' . $rr['resource-id'], $filename_e, - System::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext + DI::baseUrl() . '/photo/' . $rr['resource-id'] . '-' . $scale . '.'. $ext ]; } $files = array_map("_map_files1", $r); @@ -125,7 +124,7 @@ function fbrowser_content(App $a) $filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip"); $filename_e = $rr['filename']; - return [System::baseUrl() . '/attach/' . $rr['id'], $filename_e, System::baseUrl() . '/images/icons/16/' . $filetype . '.png']; + return [DI::baseUrl() . '/attach/' . $rr['id'], $filename_e, DI::baseUrl() . '/images/icons/16/' . $filetype . '.png']; } $files = array_map("_map_files2", $files); diff --git a/mod/follow.php b/mod/follow.php index 99601e7592..7363275de6 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -125,7 +125,7 @@ function follow_content(App $a) $request = $ret['request']; $tpl = Renderer::getMarkupTemplate('dfrn_request.tpl'); } else { - $request = System::baseUrl() . '/follow'; + $request = DI::baseUrl() . '/follow'; $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); } diff --git a/mod/item.php b/mod/item.php index d6f34e58a8..b14da4604e 100644 --- a/mod/item.php +++ b/mod/item.php @@ -81,7 +81,7 @@ function item_post(App $a) { if (!$preview && !empty($_REQUEST['post_id_random'])) { if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) { Logger::log("item post: duplicate post", Logger::DEBUG); - item_post_return(System::baseUrl(), $api_source, $return_path); + item_post_return(DI::baseUrl(), $api_source, $return_path); } else { $_SESSION['post-random'] = $_REQUEST['post_id_random']; } @@ -537,7 +537,7 @@ function item_post(App $a) { if (strlen($attachments)) { $attachments .= ','; } - $attachments .= '[attach]href="' . System::baseUrl() . '/attach/' . $attachment['id'] . + $attachments .= '[attach]href="' . DI::baseUrl() . '/attach/' . $attachment['id'] . '" length="' . $attachment['filesize'] . '" type="' . $attachment['filetype'] . '" title="' . ($attachment['filename'] ? $attachment['filename'] : '') . '"[/attach]'; } @@ -683,7 +683,7 @@ function item_post(App $a) { $json = ['cancel' => 1]; if (!empty($_REQUEST['jsreload'])) { - $json['reload'] = System::baseUrl() . '/' . $_REQUEST['jsreload']; + $json['reload'] = DI::baseUrl() . '/' . $_REQUEST['jsreload']; } echo json_encode($json); @@ -757,7 +757,7 @@ function item_post(App $a) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']), + 'link' => DI::baseUrl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], @@ -777,7 +777,7 @@ function item_post(App $a) { 'to_email' => $user['email'], 'uid' => $user['uid'], 'item' => $datarray, - 'link' => System::baseUrl().'/display/'.urlencode($datarray['guid']), + 'link' => DI::baseUrl().'/display/'.urlencode($datarray['guid']), 'source_name' => $datarray['author-name'], 'source_link' => $datarray['author-link'], 'source_photo' => $datarray['author-avatar'], @@ -799,14 +799,14 @@ function item_post(App $a) { } $disclaimer = '
' . L10n::t('This message was sent to you by %s, a member of the Friendica social network.', $a->user['username']) . '
'; - $disclaimer .= L10n::t('You may visit them online at %s', System::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; + $disclaimer .= L10n::t('You may visit them online at %s', DI::baseUrl() . '/profile/' . $a->user['nickname']) . EOL; $disclaimer .= L10n::t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; if (!$datarray['title']=='') { $subject = Email::encodeHeader($datarray['title'], 'UTF-8'); } else { $subject = Email::encodeHeader('[Friendica]' . ' ' . L10n::t('%s posted an update.', $a->user['username']), 'UTF-8'); } - $link = '' . $a->user['username'] . '

'; + $link = '' . $a->user['username'] . '

'; $html = Item::prepareBody($datarray); $message = '' . $link . $html . $disclaimer . ''; $params = [ @@ -841,7 +841,7 @@ function item_post(App $a) { return $post_id; } - item_post_return(System::baseUrl(), $api_source, $return_path); + item_post_return(DI::baseUrl(), $api_source, $return_path); // NOTREACHED } diff --git a/mod/lostpass.php b/mod/lostpass.php index 5d28143fea..81bcad79c9 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -8,7 +8,6 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -41,7 +40,7 @@ function lostpass_post(App $a) } $sitename = Config::get('config', 'sitename'); - $resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token; + $resetlink = DI::baseUrl() . '/lostpass/' . $pwdreset_token; $preamble = Strings::deindent(L10n::t(' Dear %1$s, @@ -65,7 +64,7 @@ function lostpass_post(App $a) The login details are as follows: Site Location: %2$s - Login Name: %3$s', $resetlink, System::baseUrl(), $user['nickname'])); + Login Name: %3$s', $resetlink, DI::baseUrl(), $user['nickname'])); notification([ 'type' => SYSTEM_EMAIL, @@ -138,7 +137,7 @@ function lostpass_generate_password($user) '$lbl2' => L10n::t('Your password has been reset as requested.'), '$lbl3' => L10n::t('Your new password is'), '$lbl4' => L10n::t('Save or copy your new password - and then'), - '$lbl5' => '' . L10n::t('click here to login') . '.', + '$lbl5' => '' . L10n::t('click here to login') . '.', '$lbl6' => L10n::t('Your password may be changed from the Settings page after successful login.'), '$newpass' => $new_password, ]); @@ -160,7 +159,7 @@ function lostpass_generate_password($user) Password: %3$s You may change that password from your account settings page after logging in. - ', System::baseUrl(), $user['nickname'], $new_password)); + ', DI::baseUrl(), $user['nickname'], $new_password)); notification([ 'type' => SYSTEM_EMAIL, diff --git a/mod/match.php b/mod/match.php index ae7cf73baa..0e9be28193 100644 --- a/mod/match.php +++ b/mod/match.php @@ -4,12 +4,10 @@ */ use Friendica\App; -use Friendica\Content\Pager; use Friendica\Content\Widget; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -60,7 +58,7 @@ function match_content(App $a) if (strlen(Config::get('system', 'directory'))) { $host = get_server(); } else { - $host = System::baseUrl(); + $host = DI::baseUrl(); } $msearch_json = Network::post($host . '/msearch', $params)->getBody(); @@ -83,7 +81,7 @@ function match_content(App $a) // Workaround for wrong directory photo URL $profile->photo = str_replace('http:///photo/', get_server() . '/photo/', $profile->photo); - $connlnk = System::baseUrl() . '/follow/?url=' . $profile->url; + $connlnk = DI::baseUrl() . '/follow/?url=' . $profile->url; $photo_menu = [ 'profile' => [L10n::t("View Profile"), Contact::magicLink($profile->url)], 'follow' => [L10n::t("Connect/Follow"), $connlnk] diff --git a/mod/message.php b/mod/message.php index 5c84838965..093ef07317 100644 --- a/mod/message.php +++ b/mod/message.php @@ -6,12 +6,10 @@ use Friendica\App; use Friendica\Content\Nav; use Friendica\Content\Pager; -use Friendica\Content\Smilies; use Friendica\Content\Text\BBCode; use Friendica\Core\ACL; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -42,11 +40,11 @@ function message_init(App $a) '$tabs' => $tabs, '$new' => $new, ]); - $base = System::baseUrl(); + $base = DI::baseUrl(); $head_tpl = Renderer::getMarkupTemplate('message-head.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl, [ - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$base' => $base ]); } @@ -103,7 +101,7 @@ function message_content(App $a) return Login::form(); } - $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; + $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname']; $tpl = Renderer::getMarkupTemplate('mail_head.tpl'); if ($a->argc > 1 && $a->argv[1] == 'new') { @@ -200,7 +198,7 @@ function message_content(App $a) $tpl = Renderer::getMarkupTemplate('msg-header.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$nickname' => $a->user['nickname'], '$linkurl' => L10n::t('Please enter a link URL:') ]); @@ -356,7 +354,7 @@ function message_content(App $a) $tpl = Renderer::getMarkupTemplate('msg-header.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$nickname' => $a->user['nickname'], '$linkurl' => L10n::t('Please enter a link URL:') ]); @@ -506,7 +504,7 @@ function render_messages(array $msg, $t) $tpl = Renderer::getMarkupTemplate($t); $rslt = ''; - $myprofile = System::baseUrl() . '/profile/' . $a->user['nickname']; + $myprofile = DI::baseUrl() . '/profile/' . $a->user['nickname']; foreach ($msg as $rr) { if ($rr['unknown']) { diff --git a/mod/msearch.php b/mod/msearch.php index e87a8f522c..67b8ea6fd5 100644 --- a/mod/msearch.php +++ b/mod/msearch.php @@ -1,8 +1,8 @@ $search_result['name'], - 'url' => System::baseUrl() . '/profile/' . $search_result['nickname'], - 'photo' => System::baseUrl() . '/photo/avatar/' . $search_result['uid'] . '.jpg', + 'url' => DI::baseUrl() . '/profile/' . $search_result['nickname'], + 'photo' => DI::baseUrl() . '/photo/avatar/' . $search_result['uid'] . '.jpg', 'tags' => str_replace([',', ' '], [' ', ' '], $search_result['pub_keywords']) ]; } diff --git a/mod/noscrape.php b/mod/noscrape.php index 7b8c0bdeb1..0b3d490a3b 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -5,9 +5,8 @@ use Friendica\App; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; -use Friendica\Model\Contact; +use Friendica\DI; use Friendica\Model\Profile; use Friendica\Model\User; @@ -32,14 +31,14 @@ function noscrape_init(App $a) 'nick' => $which, 'guid' => $a->profile['guid'], 'key' => $a->profile['pubkey'], - 'homepage' => System::baseUrl()."/profile/{$which}", + 'homepage' => DI::baseUrl()."/profile/{$which}", 'comm' => ($a->profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY), 'account-type' => $a->profile['account-type'], ]; $dfrn_pages = ['request', 'confirm', 'notify', 'poll']; foreach ($dfrn_pages as $dfrn) { - $json_info["dfrn-{$dfrn}"] = System::baseUrl()."/dfrn_{$dfrn}/{$which}"; + $json_info["dfrn-{$dfrn}"] = DI::baseUrl()."/dfrn_{$dfrn}/{$which}"; } if (!$a->profile['net-publish'] || $a->profile['hidewall']) { diff --git a/mod/oexchange.php b/mod/oexchange.php index a55ee56d21..751cb97884 100644 --- a/mod/oexchange.php +++ b/mod/oexchange.php @@ -5,7 +5,7 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; +use Friendica\DI; use Friendica\Module\Security\Login; use Friendica\Util\Network; use Friendica\Util\Strings; @@ -15,7 +15,7 @@ function oexchange_init(App $a) { if (($a->argc > 1) && ($a->argv[1] === 'xrd')) { $tpl = Renderer::getMarkupTemplate('oexchange_xrd.tpl'); - $o = Renderer::replaceMacros($tpl, ['$base' => System::baseUrl()]); + $o = Renderer::replaceMacros($tpl, ['$base' => DI::baseUrl()]); echo $o; exit(); } @@ -42,7 +42,7 @@ function oexchange_content(App $a) { $tags = ((!empty($_REQUEST['tags'])) ? '&tags=' . urlencode(Strings::escapeTags(trim($_REQUEST['tags']))) : ''); - $s = Network::fetchUrl(System::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags); + $s = Network::fetchUrl(DI::baseUrl() . '/parse_url?f=&url=' . $url . $title . $description . $tags); if (!strlen($s)) { return; diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php index ec79f87e50..e199b2818c 100644 --- a/mod/ostatus_subscribe.php +++ b/mod/ostatus_subscribe.php @@ -7,7 +7,6 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\DI; use Friendica\Model\Contact; use Friendica\Network\Probe; @@ -63,7 +62,7 @@ function ostatus_subscribe_content(App $a) $total = sizeof($friends); if ($counter >= $total) { - DI::page()['htmlhead'] = ''; + DI::page()['htmlhead'] = ''; PConfig::delete($uid, 'ostatus', 'legacy_friends'); PConfig::delete($uid, 'ostatus', 'legacy_contact'); $o .= L10n::t('Done'); @@ -92,7 +91,7 @@ function ostatus_subscribe_content(App $a) $o .= '

' . L10n::t('Keep this window open until done.') . '

'; - DI::page()['htmlhead'] = ''; + DI::page()['htmlhead'] = ''; return $o; } diff --git a/mod/photos.php b/mod/photos.php index fde2d6c897..e763704c40 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -398,8 +398,8 @@ function photos_post(App $a) $arr['visible'] = $visibility; $arr['origin'] = 1; - $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']' - . '[img]' . System::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]' + $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $photo['resource-id'] . ']' + . '[img]' . DI::baseUrl() . '/photo/' . $photo['resource-id'] . '-' . $photo['scale'] . '.'. $ext . '[/img]' . '[/url]'; $item_id = Item::insert($arr); @@ -509,7 +509,7 @@ function photos_post(App $a) } } elseif (strpos($tag, '#') === 0) { $tagname = substr($tag, 1); - $str_tags .= '#[url=' . System::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],'; + $str_tags .= '#[url=' . DI::baseUrl() . "/search?tag=" . $tagname . ']' . $tagname . '[/url],'; } } } @@ -573,8 +573,8 @@ function photos_post(App $a) $arr['tag'] = $tagged[4]; $arr['inform'] = $tagged[2]; $arr['origin'] = 1; - $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; - $arr['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . System::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; + $arr['body'] = L10n::t('%1$s was tagged in %2$s by %3$s', '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]', '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . L10n::t('a photo') . '[/url]', '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]') ; + $arr['body'] .= "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ']' . '[img]' . DI::baseUrl() . "/photo/" . $photo['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; $arr['object'] = '' . Activity\ObjectType::PERSON . '' . $tagged[0] . '' . $tagged[1] . '/' . $tagged[0] . ''; $arr['object'] .= '' . XML::escape('' . "\n"); @@ -584,8 +584,8 @@ function photos_post(App $a) $arr['object'] .= '' . "\n"; $arr['target'] = '' . Activity\ObjectType::IMAGE . '' . $photo['desc'] . '' - . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ''; - $arr['target'] .= '' . XML::escape('' . "\n" . '') . ''; + . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo['resource-id'] . ''; + $arr['target'] .= '' . XML::escape('' . "\n" . '') . ''; Item::insert($arr); } @@ -804,8 +804,8 @@ function photos_post(App $a) $arr['visible'] = $visible; $arr['origin'] = 1; - $arr['body'] = '[url=' . System::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']' - . '[img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]' + $arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nickname'] . '/image/' . $resource_id . ']' + . '[img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]' . '[/url]'; $item_id = Item::insert($arr); @@ -1529,7 +1529,7 @@ function photos_content(App $a) DI::page()['htmlhead'] .= "\n" . '' . "\n"; DI::page()['htmlhead'] .= '' . "\n"; - DI::page()['htmlhead'] .= '' . "\n"; + DI::page()['htmlhead'] .= '' . "\n"; DI::page()['htmlhead'] .= '' . "\n"; DI::page()['htmlhead'] .= '' . "\n"; diff --git a/mod/ping.php b/mod/ping.php index f30d1a61b9..c76780f697 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -11,8 +11,8 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; @@ -179,7 +179,7 @@ function ping_init(App $a) $intro_count = count($intros1) + count($intros2); $intros = $intros1 + $intros2; - $myurl = System::baseUrl() . '/profile/' . $a->user['nickname']; + $myurl = DI::baseUrl() . '/profile/' . $a->user['nickname']; $mails = q( "SELECT `id`, `from-name`, `from-url`, `from-photo`, `created` FROM `mail` WHERE `uid` = %d AND `seen` = 0 AND `from-url` != '%s' ", @@ -263,7 +263,7 @@ function ping_init(App $a) foreach ($intros as $intro) { $notif = [ 'id' => 0, - 'href' => System::baseUrl() . '/notifications/intros/' . $intro['id'], + 'href' => DI::baseUrl() . '/notifications/intros/' . $intro['id'], 'name' => $intro['name'], 'url' => $intro['url'], 'photo' => $intro['photo'], @@ -279,7 +279,7 @@ function ping_init(App $a) foreach ($regs as $reg) { $notif = [ 'id' => 0, - 'href' => System::baseUrl() . '/admin/users/', + 'href' => DI::baseUrl() . '/admin/users/', 'name' => $reg['name'], 'url' => $reg['url'], 'photo' => $reg['micro'], @@ -446,7 +446,7 @@ function ping_get_notifications($uid) ); } - $notification["href"] = System::baseUrl() . "/notify/view/" . $notification["id"]; + $notification["href"] = DI::baseUrl() . "/notify/view/" . $notification["id"]; if ($notification["visible"] && !$notification["deleted"] diff --git a/mod/poke.php b/mod/poke.php index 9a0e50362e..900aa8e759 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -158,7 +158,7 @@ function poke_content(App $a) $head_tpl = Renderer::getMarkupTemplate('poke_head.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($head_tpl,[ - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), ]); $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0'); diff --git a/mod/profile_photo.php b/mod/profile_photo.php index e04062a4d5..acdf90985d 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -8,7 +8,6 @@ use Friendica\BaseModule; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -115,8 +114,8 @@ function profile_photo_post(App $a) ); } else { q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d", - DBA::escape(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()), - DBA::escape(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()), + DBA::escape(DI::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()), + DBA::escape(DI::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()), intval($_REQUEST['profile']), intval(local_user()) ); } @@ -249,7 +248,7 @@ function profile_photo_content(App $a) '$profiles' => $profiles, '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"), '$select' => sprintf('%s %s', L10n::t('or'), - ($newuser) ? '' . L10n::t('skip this step') . '' : '' . L10n::t('select a photo from your photo albums') . '') + ($newuser) ? '' . L10n::t('skip this step') . '' : '' . L10n::t('select a photo from your photo albums') . '') ]); return $o; @@ -261,7 +260,7 @@ function profile_photo_content(App $a) '$filename' => $filename, '$profile' => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0), '$resource' => $imagecrop['hash'] . '-' . $imagecrop['resolution'], - '$image_url' => System::baseUrl() . '/photo/' . $filename, + '$image_url' => DI::baseUrl() . '/photo/' . $filename, '$title' => L10n::t('Crop Image'), '$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'), '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"), diff --git a/mod/profiles.php b/mod/profiles.php index 13e92b054e..575d3443fb 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -13,7 +13,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -514,7 +513,7 @@ function profiles_content(App $a) { } DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('profed_head.tpl'), [ - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), ]); $opt_tpl = Renderer::getMarkupTemplate("profile-hide-friends.tpl"); @@ -588,7 +587,7 @@ function profiles_content(App $a) { '$lbl_ex2' => L10n::t('Example: fishing photography software'), '$disabled' => (($is_default) ? 'onclick="return false;" style="color: #BBBBFF;"' : ''), - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$profile_id' => $r[0]['id'], '$profile_name' => ['profile_name', L10n::t('Profile Name:'), $r[0]['profile-name'], L10n::t('Required'), '*'], '$is_default' => $is_default, diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php index f71984ec18..d63a05d746 100644 --- a/mod/pubsubhubbub.php +++ b/mod/pubsubhubbub.php @@ -3,8 +3,8 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\PushSubscriber; use Friendica\Util\Network; use Friendica\Util\Strings; @@ -89,7 +89,7 @@ function pubsubhubbub_init(App $a) { // sanity check that topic URLs are the same $hub_topic2 = str_replace('/feed/', '/dfrn_poll/', $hub_topic); - $self = System::baseUrl() . '/api/statuses/user_timeline/' . $owner['nickname'] . '.atom'; + $self = DI::baseUrl() . '/api/statuses/user_timeline/' . $owner['nickname'] . '.atom'; if (!Strings::compareLink($hub_topic, $contact['poll']) && !Strings::compareLink($hub_topic2, $contact['poll']) && !Strings::compareLink($hub_topic, $self)) { Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']); diff --git a/mod/redir.php b/mod/redir.php index 9b4b440bbc..4c687e40d3 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -149,7 +149,7 @@ function redir_magic($a, $cid, $url) $basepath = Contact::getBasepath($contact_url); // We don't use magic auth when there is no visitor, we are on the same system or we visit our own stuff - if (empty($visitor) || Strings::compareLink($basepath, System::baseUrl()) || Strings::compareLink($contact_url, $visitor)) { + if (empty($visitor) || Strings::compareLink($basepath, DI::baseUrl()) || Strings::compareLink($contact_url, $visitor)) { Logger::info('Redirecting without magic', ['target' => $target_url, 'visitor' => $visitor, 'contact' => $contact_url]); System::externalRedirect($target_url); } diff --git a/mod/regmod.php b/mod/regmod.php index 7aecbc3bdb..49845e8731 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -6,7 +6,6 @@ use Friendica\App; use Friendica\Core\Config; use Friendica\Core\L10n; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -33,7 +32,7 @@ function user_allow($hash) $profile = DBA::selectFirst('profile', ['net-publish'], ['uid' => $register['uid'], 'is-default' => true]); if (DBA::isResult($profile) && $profile['net-publish'] && Config::get('system', 'directory')) { - $url = System::baseUrl() . '/profile/' . $user['nickname']; + $url = DI::baseUrl() . '/profile/' . $user['nickname']; Worker::add(PRIORITY_LOW, "Directory", $url); } diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php index 30ad1476ca..a4ba0b72ee 100644 --- a/mod/repair_ostatus.php +++ b/mod/repair_ostatus.php @@ -6,7 +6,6 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -23,8 +22,6 @@ function repair_ostatus_content(App $a) { $uid = local_user(); - $a = \get_app(); - $counter = intval($_REQUEST['counter']); $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE @@ -60,7 +57,7 @@ function repair_ostatus_content(App $a) { Contact::createFromProbe($uid, $r[0]["url"], true); - DI::page()['htmlhead'] = ''; + DI::page()['htmlhead'] = ''; return $o; } diff --git a/mod/settings.php b/mod/settings.php index 9e47b3d2e1..4f13fc72fc 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -15,7 +15,6 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Session; -use Friendica\Core\System; use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBA; @@ -787,7 +786,7 @@ function settings_content(App $a) if (!empty($legacy_contact)) { /// @todo Isn't it supposed to be a $a->internalRedirect() call? - DI::page()['htmlhead'] = ''; + DI::page()['htmlhead'] = ''; } $settings_connectors = ''; @@ -851,7 +850,7 @@ function settings_content(App $a) '$default_group' => Group::displayGroupSelection(local_user(), $default_group, L10n::t("Default group for OStatus contacts")), '$legacy_contact' => ['legacy_contact', L10n::t('Your legacy GNU Social account'), $legacy_contact, L10n::t("If you enter your old GNU Social/Statusnet account name here \x28in the format user@domain.tld\x29, your contacts will be added automatically. The field will be emptied when done.")], - '$repair_ostatus_url' => System::baseUrl() . '/repair_ostatus', + '$repair_ostatus_url' => DI::baseUrl() . '/repair_ostatus', '$repair_ostatus_text' => L10n::t('Repair OStatus subscriptions'), '$settings_connectors' => $settings_connectors, @@ -949,7 +948,7 @@ function settings_content(App $a) '$ptitle' => L10n::t('Display Settings'), '$form_security_token' => BaseModule::getFormSecurityToken("settings_display"), '$submit' => L10n::t('Save Settings'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$uid' => local_user(), '$theme' => ['theme', L10n::t('Display Theme:'), $theme_selected, '', $themes, true], @@ -1084,7 +1083,7 @@ function settings_content(App $a) $profile_in_dir = ''; } else { $profile_in_dir = Renderer::replaceMacros($opt_tpl, [ - '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', DI::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]] ]); } @@ -1127,7 +1126,7 @@ function settings_content(App $a) $tpl_addr = Renderer::getMarkupTemplate('settings/nick_set.tpl'); $prof_addr = Renderer::replaceMacros($tpl_addr,[ - '$desc' => L10n::t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), System::baseUrl() . '/profile/' . $nickname), + '$desc' => L10n::t("Your Identity Address is '%s' or '%s'.", $nickname . '@' . DI::baseUrl()->getHostname() . DI::baseUrl()->getUrlPath(), DI::baseUrl() . '/profile/' . $nickname), '$basepath' => DI::baseUrl()->getHostname() ]); @@ -1174,7 +1173,7 @@ function settings_content(App $a) '$ptitle' => L10n::t('Account Settings'), '$submit' => L10n::t('Save Settings'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$uid' => local_user(), '$form_security_token' => BaseModule::getFormSecurityToken("settings"), '$nickname_block' => $prof_addr, diff --git a/mod/subthread.php b/mod/subthread.php index aa65b86218..02d5cdcce5 100644 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -10,6 +10,7 @@ use Friendica\Core\Logger; use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Protocol\Activity; use Friendica\Util\Security; @@ -90,7 +91,7 @@ function subthread_content(App $a) { $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); $objtype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE ); - $link = XML::escape('' . "\n"); + $link = XML::escape('' . "\n"); $body = $item['body']; $obj = <<< EOT @@ -131,7 +132,7 @@ EOT; $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; - $plink = '[url=' . System::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]'; + $plink = '[url=' . DI::baseUrl() . '/display/' . $item['guid'] . ']' . $post_type . '[/url]'; $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink ); $arr['verb'] = $activity; diff --git a/mod/suggest.php b/mod/suggest.php index aab313366b..31f02fa4ce 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -8,7 +8,6 @@ use Friendica\Content\ContactSelector; use Friendica\Content\Widget; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -82,8 +81,8 @@ function suggest_content(App $a) $entries = []; foreach ($r as $rr) { - $connlnk = System::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); - $ignlnk = System::baseUrl() . '/suggest?ignore=' . $rr['id']; + $connlnk = DI::baseUrl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); + $ignlnk = DI::baseUrl() . '/suggest?ignore=' . $rr['id']; $photo_menu = [ 'profile' => [L10n::t("View Profile"), Contact::magicLink($rr["url"])], 'follow' => [L10n::t("Connect/Follow"), $connlnk], diff --git a/mod/tagger.php b/mod/tagger.php index 7532adb3fb..a366976bd9 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -11,6 +11,7 @@ use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Protocol\Activity; use Friendica\Util\Strings; @@ -71,7 +72,7 @@ function tagger_content(App $a) { $xterm = XML::escape($term); $post_type = (($item['resource-id']) ? L10n::t('photo') : L10n::t('status')); $targettype = (($item['resource-id']) ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE ); - $href = System::baseUrl() . '/display/' . $item['guid']; + $href = DI::baseUrl() . '/display/' . $item['guid']; $link = XML::escape('' . "\n"); @@ -88,7 +89,7 @@ function tagger_content(App $a) { EOT; - $tagid = System::baseUrl() . '/search?tag=' . $xterm; + $tagid = DI::baseUrl() . '/search?tag=' . $xterm; $objtype = Activity\ObjectType::TAGTERM; $obj = <<< EOT @@ -108,7 +109,7 @@ EOT; return; } - $termlink = html_entity_decode('⌗') . '[url=' . System::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'; + $termlink = html_entity_decode('⌗') . '[url=' . DI::baseUrl() . '/search?tag=' . $term . ']'. $term . '[/url]'; $arr = []; diff --git a/mod/unfollow.php b/mod/unfollow.php index 9f9ebdf593..280ca164e6 100644 --- a/mod/unfollow.php +++ b/mod/unfollow.php @@ -7,7 +7,6 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -101,7 +100,7 @@ function unfollow_content(App $a) // NOTREACHED } - $request = System::baseUrl() . '/unfollow'; + $request = DI::baseUrl() . '/unfollow'; $tpl = Renderer::getMarkupTemplate('auto_request.tpl'); $self = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]); diff --git a/mod/videos.php b/mod/videos.php index 2c21be0cc8..ad3a27b003 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -9,17 +9,14 @@ use Friendica\Content\Pager; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Attach; use Friendica\Model\Contact; -use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Profile; use Friendica\Model\User; -use Friendica\Protocol\DFRN; use Friendica\Util\Security; function videos_init(App $a) @@ -235,13 +232,13 @@ function videos_content(App $a) $videos[] = [ 'id' => $rr['id'], - 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'], + 'link' => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'], 'title' => L10n::t('View Video'), - 'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', + 'src' => DI::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', 'alt' => $alt_e, 'mime' => $rr['filetype'], 'album' => [ - 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), + 'link' => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), 'name' => $name_e, 'alt' => L10n::t('View Album'), ], @@ -253,9 +250,9 @@ function videos_content(App $a) $o .= Renderer::replaceMacros($tpl, [ '$title' => L10n::t('Recent Videos'), '$can_post' => $can_post, - '$upload' => [L10n::t('Upload New Videos'), System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'], + '$upload' => [L10n::t('Upload New Videos'), DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'], '$videos' => $videos, - '$delete_url' => (($can_post) ? System::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false) + '$delete_url' => (($can_post) ? DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false) ]); $o .= $pager->renderFull($total); diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 31112367a9..aa8f459c7b 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -13,8 +13,8 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Session; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Photo; use Friendica\Model\User; use Friendica\Object\Image; @@ -281,9 +281,9 @@ function wall_upload_post(App $a, $desktopmode = true) $picture["width"] = $r[0]["width"]; $picture["height"] = $r[0]["height"]; $picture["type"] = $r[0]["type"]; - $picture["albumpage"] = System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id; - $picture["picture"] = System::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt(); - $picture["preview"] = System::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt(); + $picture["albumpage"] = DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id; + $picture["picture"] = DI::baseUrl() . "/photo/{$resource_id}-0." . $Image->getExt(); + $picture["preview"] = DI::baseUrl() . "/photo/{$resource_id}-{$smallest}." . $Image->getExt(); if ($r_json) { echo json_encode(['picture' => $picture]); @@ -300,7 +300,7 @@ function wall_upload_post(App $a, $desktopmode = true) exit(); } - echo "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . System::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n"; + echo "\n\n" . '[url=' . DI::baseUrl() . '/photos/' . $page_owner_nick . '/image/' . $resource_id . '][img]' . DI::baseUrl() . "/photo/{$resource_id}-{$smallest}.".$Image->getExt()."[/img][/url]\n\n"; exit(); // NOTREACHED } diff --git a/mod/wallmessage.php b/mod/wallmessage.php index e9e9057455..1d7af71360 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -6,7 +6,6 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Mail; @@ -119,7 +118,7 @@ function wallmessage_content(App $a) { $tpl = Renderer::getMarkupTemplate('wallmsg-header.tpl'); DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(true), + '$baseurl' => DI::baseUrl()->get(true), '$nickname' => $user['nickname'], '$linkurl' => L10n::t('Please enter a link URL:') ]); diff --git a/src/App/BaseURL.php b/src/App/BaseURL.php index ea7d9ec74a..6b79fad466 100644 --- a/src/App/BaseURL.php +++ b/src/App/BaseURL.php @@ -435,4 +435,12 @@ class BaseURL $redirectTo = $this->get($ssl) . '/' . ltrim($toUrl, '/'); System::externalRedirect($redirectTo); } + + /** + * Returns the base url as string + */ + public function __toString() + { + return $this->get(); + } } diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 3594bae50e..3685a8b327 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -10,7 +10,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\Session; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Profile; @@ -141,7 +140,7 @@ class Nav $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : ''); - $sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2); + $sitelocation = $myident . substr(DI::baseUrl()->get($ssl_state), strpos(DI::baseUrl()->get($ssl_state), '//') + 2); // nav links: array of array('href', 'text', 'extra css classes', 'title') $nav = []; diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 94e95e5f51..42748d69ba 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -15,8 +15,8 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\ParseUrl; @@ -373,7 +373,7 @@ class OEmbed } $width = '100%'; - $src = System::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src); + $src = DI::baseUrl() . '/oembed/' . Strings::base64UrlEncode($src); return ''; } diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php index 2bf232d090..08c6309018 100644 --- a/src/Content/Smilies.php +++ b/src/Content/Smilies.php @@ -17,7 +17,7 @@ namespace Friendica\Content; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\PConfig; -use Friendica\Core\System; +use Friendica\DI; use Friendica\Util\Strings; /** @@ -102,42 +102,44 @@ class Smilies ]; + $baseUrl = DI::baseUrl(); + $icons = [ - '<3', - '</3', - '<\\3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-p', - ':-\', - ':-\', - ':-x', - ':-X', - ':-D', - '8-|', - '8-O', - ':-O', - '\\o/', - 'o.O', - 'O.o', - 'o_O', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':homebrew', - ':coffee', - ':facepalm', - ':like', - ':dislike', - '~friendica ~friendica', - 'redred#matrix', - 'redred#matrixmatrix' + '<3', + '</3', + '<\\3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-p', + ':-\', + ':-\', + ':-x', + ':-X', + ':-D', + '8-|', + '8-O', + ':-O', + '\\o/', + 'o.O', + 'O.o', + 'o_O', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':homebrew', + ':coffee', + ':facepalm', + ':like', + ':dislike', + '~friendica ~friendica', + 'redred#matrix', + 'redred#matrixmatrix' ]; $params = ['texts' => $texts, 'icons' => $icons]; diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index ada0a0f35a..11caeb6ecb 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -452,7 +452,7 @@ class BBCode foreach ($matches as $mtch) { Logger::log('scale_external_image: ' . $mtch[1]); - $hostname = str_replace('www.', '', substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3)); + $hostname = str_replace('www.', '', substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3)); if (stristr($mtch[1], $hostname)) { continue; } @@ -1626,9 +1626,9 @@ class BBCode $text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '' . L10n::t('Image/photo') . '', $text); $text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/ism", '' . L10n::t('Image/photo') . '', $text); - $text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $text); - $text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $text); - //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $Text); + $text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $text); + $text = preg_replace("/\[crypt(.*?)\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $text); + //$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism", '
' . L10n::t('Encrypted content') . '
', $Text); // Simplify "video" element $text = preg_replace('(\[video.*?\ssrc\s?=\s?([^\s\]]+).*?\].*?\[/video\])ism', '[video]$1[/video]', $text); @@ -1778,21 +1778,21 @@ class BBCode $text = preg_replace_callback( "&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi", function ($match) { - return "[url=" . System::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]"; + return "[url=" . DI::baseUrl() . "/display/" . $match[1] . "]" . $match[2] . "[/url]"; }, $text ); $text = preg_replace_callback( "&\[url=/people\?q\=(.*)\](.*)\[\/url\]&Usi", function ($match) { - return "[url=" . System::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]"; + return "[url=" . DI::baseUrl() . "/search?search=%40" . $match[1] . "]" . $match[2] . "[/url]"; }, $text ); // Server independent link to posts and comments // See issue: https://github.com/diaspora/diaspora_federation/issues/75 $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism"; - $text = preg_replace($expression, System::baseUrl()."/display/$1", $text); + $text = preg_replace($expression, DI::baseUrl()."/display/$1", $text); /* Tag conversion * Supports: @@ -1801,15 +1801,15 @@ class BBCode */ $text = preg_replace_callback("/(?:#\[url\=[^\[\]]*\]|\[url\=[^\[\]]*\]#)(.*?)\[\/url\]/ism", function($matches) { return '#'; }, $text); // We need no target="_blank" for local links - // convert links start with System::baseUrl() as local link without the target="_blank" attribute - $escapedBaseUrl = preg_quote(System::baseUrl(), '/'); + // convert links start with DI::baseUrl() as local link without the target="_blank" attribute + $escapedBaseUrl = preg_quote(DI::baseUrl(), '/'); $text = preg_replace("/\[url\](".$escapedBaseUrl.".*?)\[\/url\]/ism", '$1', $text); $text = preg_replace("/\[url\=(".$escapedBaseUrl.".*?)\](.*?)\[\/url\]/ism", '$2', $text); @@ -1823,7 +1823,7 @@ class BBCode // we may need to restrict this further if it picks up too many strays // link acct:user@host to a webfinger profile redirector - $text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $text); + $text = preg_replace('/acct:([^@]+)@((?!\-)(?:[a-zA-Z\d\-]{0,62}[a-zA-Z\d]\.){1,126}(?!\d+)[a-zA-Z\d]{1,63})/', 'acct:$1@$2', $text); // Perform MAIL Search $text = preg_replace("/\[mail\](.*?)\[\/mail\]/", '$1', $text); diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 25c159a5ce..f1f8f25fa3 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -10,7 +10,6 @@ use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Session; use Friendica\Database\DBA; use Friendica\DI; @@ -23,7 +22,6 @@ use Friendica\Util\DateTimeFormat; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; use Friendica\Util\Temporal; -use Friendica\Util\XML; class Widget { @@ -402,7 +400,7 @@ class Widget $tpl = Renderer::getMarkupTemplate('widget/remote_friends_common.tpl'); return Renderer::replaceMacros($tpl, [ '$desc' => L10n::tt("%d contact in common", "%d contacts in common", $t), - '$base' => System::baseUrl(), + '$base' => DI::baseUrl(), '$uid' => $profile_uid, '$cid' => (($cid) ? $cid : '0'), '$linkmore' => (($t > 5) ? 'true' : ''), diff --git a/src/Core/System.php b/src/Core/System.php index d5902c003a..132a64fe51 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -20,17 +20,6 @@ use Friendica\Util\XML; */ class System { - /** - * @brief Retrieves the Friendica instance base URL - * - * @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN - * @return string Friendica server base URL - */ - public static function baseUrl($ssl = false) - { - return DI::baseUrl()->get($ssl); - } - /** * @brief Removes the baseurl from an url. This avoids some mixed content problems. * diff --git a/src/Core/Theme.php b/src/Core/Theme.php index a4dfe2f9fa..6f0d9d4360 100644 --- a/src/Core/Theme.php +++ b/src/Core/Theme.php @@ -125,10 +125,10 @@ class Theme $exts = ['.png', '.jpg']; foreach ($exts as $ext) { if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) { - return System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext; + return DI::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext; } } - return System::baseUrl() . '/images/blank.png'; + return DI::baseUrl() . '/images/blank.png'; } public static function uninstall($theme) diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php index b06e01e9f7..fdacd2b2bf 100644 --- a/src/Core/UserImport.php +++ b/src/Core/UserImport.php @@ -123,7 +123,7 @@ class UserImport } $oldbaseurl = $account['baseurl']; - $newbaseurl = System::baseUrl(); + $newbaseurl = DI::baseUrl(); $oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl)); $newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl)); diff --git a/src/Core/Worker.php b/src/Core/Worker.php index 62f7bd4c6a..02c8f65cbb 100644 --- a/src/Core/Worker.php +++ b/src/Core/Worker.php @@ -979,7 +979,7 @@ class Worker return; } - $url = System::baseUrl()."/worker"; + $url = DI::baseUrl() . '/worker'; Network::fetchUrl($url, false, 1); } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index d0d5d68666..0262a4a9fd 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -303,7 +303,7 @@ class Contact */ public static function isLocal($url) { - return Strings::compareLink(self::getBasepath($url, true), System::baseUrl()); + return Strings::compareLink(self::getBasepath($url, true), DI::baseUrl()); } /** @@ -647,19 +647,19 @@ class Contact 'self' => 1, 'name' => $user['username'], 'nick' => $user['nickname'], - 'photo' => System::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg', - 'thumb' => System::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg', - 'micro' => System::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg', + 'photo' => DI::baseUrl() . '/photo/profile/' . $user['uid'] . '.jpg', + 'thumb' => DI::baseUrl() . '/photo/avatar/' . $user['uid'] . '.jpg', + 'micro' => DI::baseUrl() . '/photo/micro/' . $user['uid'] . '.jpg', 'blocked' => 0, 'pending' => 0, - 'url' => System::baseUrl() . '/profile/' . $user['nickname'], - 'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']), - 'addr' => $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3), - 'request' => System::baseUrl() . '/dfrn_request/' . $user['nickname'], - 'notify' => System::baseUrl() . '/dfrn_notify/' . $user['nickname'], - 'poll' => System::baseUrl() . '/dfrn_poll/' . $user['nickname'], - 'confirm' => System::baseUrl() . '/dfrn_confirm/' . $user['nickname'], - 'poco' => System::baseUrl() . '/poco/' . $user['nickname'], + 'url' => DI::baseUrl() . '/profile/' . $user['nickname'], + 'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']), + 'addr' => $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3), + 'request' => DI::baseUrl() . '/dfrn_request/' . $user['nickname'], + 'notify' => DI::baseUrl() . '/dfrn_notify/' . $user['nickname'], + 'poll' => DI::baseUrl() . '/dfrn_poll/' . $user['nickname'], + 'confirm' => DI::baseUrl() . '/dfrn_confirm/' . $user['nickname'], + 'poco' => DI::baseUrl() . '/poco/' . $user['nickname'], 'name-date' => DateTimeFormat::utcNow(), 'uri-date' => DateTimeFormat::utcNow(), 'avatar-date' => DateTimeFormat::utcNow(), @@ -722,7 +722,7 @@ class Contact // We are adding a timestamp value so that other systems won't use cached content $timestamp = strtotime($fields['avatar-date']); - $prefix = System::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; + $prefix = DI::baseUrl() . '/photo/' .$avatar['resource-id'] . '-'; $suffix = '.' . $file_suffix . '?ts=' . $timestamp; $fields['photo'] = $prefix . '4' . $suffix; @@ -730,25 +730,25 @@ class Contact $fields['micro'] = $prefix . '6' . $suffix; } else { // We hadn't found a photo entry, so we use the default avatar - $fields['photo'] = System::baseUrl() . '/images/person-300.jpg'; - $fields['thumb'] = System::baseUrl() . '/images/person-80.jpg'; - $fields['micro'] = System::baseUrl() . '/images/person-48.jpg'; + $fields['photo'] = DI::baseUrl() . '/images/person-300.jpg'; + $fields['thumb'] = DI::baseUrl() . '/images/person-80.jpg'; + $fields['micro'] = DI::baseUrl() . '/images/person-48.jpg'; } - $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix; + $fields['avatar'] = DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix; $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY; $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP; $fields['unsearchable'] = $user['hidewall'] || !$profile['net-publish']; // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine. - $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname']; + $fields['url'] = DI::baseUrl() . '/profile/' . $user['nickname']; $fields['nurl'] = Strings::normaliseLink($fields['url']); - $fields['addr'] = $user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); - $fields['request'] = System::baseUrl() . '/dfrn_request/' . $user['nickname']; - $fields['notify'] = System::baseUrl() . '/dfrn_notify/' . $user['nickname']; - $fields['poll'] = System::baseUrl() . '/dfrn_poll/'. $user['nickname']; - $fields['confirm'] = System::baseUrl() . '/dfrn_confirm/' . $user['nickname']; - $fields['poco'] = System::baseUrl() . '/poco/' . $user['nickname']; + $fields['addr'] = $user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); + $fields['request'] = DI::baseUrl() . '/dfrn_request/' . $user['nickname']; + $fields['notify'] = DI::baseUrl() . '/dfrn_notify/' . $user['nickname']; + $fields['poll'] = DI::baseUrl() . '/dfrn_poll/'. $user['nickname']; + $fields['confirm'] = DI::baseUrl() . '/dfrn_confirm/' . $user['nickname']; + $fields['poco'] = DI::baseUrl() . '/poco/' . $user['nickname']; $update = false; @@ -769,8 +769,8 @@ class Contact DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]); // Update the profile - $fields = ['photo' => System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix, - 'thumb' => System::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix]; + $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix, + 'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix]; DBA::update('profile', $fields, ['uid' => $uid, 'is-default' => true]); } } @@ -1191,7 +1191,7 @@ class Contact $sparkle = false; if (($contact['network'] === Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { $sparkle = true; - $profile_link = System::baseUrl() . '/redir/' . $contact['id']; + $profile_link = DI::baseUrl() . '/redir/' . $contact['id']; } else { $profile_link = $contact['url']; } @@ -1207,19 +1207,19 @@ class Contact } if (self::canReceivePrivateMessages($contact) && empty($contact['pending'])) { - $pm_url = System::baseUrl() . '/message/new/' . $contact['id']; + $pm_url = DI::baseUrl() . '/message/new/' . $contact['id']; } if (($contact['network'] == Protocol::DFRN) && !$contact['self'] && empty($contact['pending'])) { - $poke_link = System::baseUrl() . '/poke/?c=' . $contact['id']; + $poke_link = DI::baseUrl() . '/poke/?c=' . $contact['id']; } - $contact_url = System::baseUrl() . '/contact/' . $contact['id']; + $contact_url = DI::baseUrl() . '/contact/' . $contact['id']; - $posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations'; + $posts_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/conversations'; if (!$contact['self']) { - $contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1'; + $contact_drop_link = DI::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1'; } $follow_link = ''; @@ -2268,7 +2268,7 @@ class Contact if (($protocol === Protocol::DFRN) && !DBA::isResult($contact)) { if ($interactive) { if (strlen(DI::baseUrl()->getUrlPath())) { - $myaddr = bin2hex(System::baseUrl() . '/profile/' . $a->user['nickname']); + $myaddr = bin2hex(DI::baseUrl() . '/profile/' . $a->user['nickname']); } else { $myaddr = bin2hex($a->user['nickname'] . '@' . DI::baseUrl()->getHostname()); } @@ -2594,7 +2594,7 @@ class Contact 'to_name' => $user['username'], 'to_email' => $user['email'], 'uid' => $user['uid'], - 'link' => System::baseUrl() . '/notifications/intro', + 'link' => DI::baseUrl() . '/notifications/intro', 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : L10n::t('[Name Withheld]')), 'source_link' => $contact_record['url'], 'source_photo' => $contact_record['photo'], diff --git a/src/Model/Event.php b/src/Model/Event.php index 0374c6bb7c..ec39cc7133 100644 --- a/src/Model/Event.php +++ b/src/Model/Event.php @@ -13,6 +13,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Protocol\Activity; use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; @@ -589,9 +590,9 @@ class Event $copy = null; $drop = null; if (local_user() && local_user() == $event['uid'] && $event['type'] == 'event') { - $edit = !$event['cid'] ? [System::baseUrl() . '/events/event/' . $event['id'], L10n::t('Edit event') , '', ''] : null; - $copy = !$event['cid'] ? [System::baseUrl() . '/events/copy/' . $event['id'] , L10n::t('Duplicate event'), '', ''] : null; - $drop = [System::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event') , '', '']; + $edit = !$event['cid'] ? [DI::baseUrl() . '/events/event/' . $event['id'], L10n::t('Edit event') , '', ''] : null; + $copy = !$event['cid'] ? [DI::baseUrl() . '/events/copy/' . $event['id'] , L10n::t('Duplicate event'), '', ''] : null; + $drop = [DI::baseUrl() . '/events/drop/' . $event['id'] , L10n::t('Delete event') , '', '']; } $title = BBCode::convert(Strings::escapeHtml($event['summary'])); diff --git a/src/Model/GContact.php b/src/Model/GContact.php index 61e44b4106..189cc579ba 100644 --- a/src/Model/GContact.php +++ b/src/Model/GContact.php @@ -12,8 +12,8 @@ use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\System; -use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Network\Probe; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\PortableContact; @@ -149,7 +149,7 @@ class GContact } // The global contacts should contain the original picture, not the cached one - if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(System::baseUrl() . '/photo/'))) { + if (($gcontact['generation'] != 1) && stristr(Strings::normaliseLink($gcontact['photo']), Strings::normaliseLink(DI::baseUrl() . '/photo/'))) { $gcontact['photo'] = ''; } @@ -503,9 +503,9 @@ class GContact $done = []; /// @TODO Check if it is really neccessary to poll the own server - PortableContact::loadWorker(0, 0, 0, System::baseUrl() . '/poco'); + PortableContact::loadWorker(0, 0, 0, DI::baseUrl() . '/poco'); - $done[] = System::baseUrl() . '/poco'; + $done[] = DI::baseUrl() . '/poco'; if (strlen(Config::get('system', 'directory'))) { $x = Network::fetchUrl(get_server() . '/pubsites'); @@ -1122,7 +1122,7 @@ class GContact "notify" => $userdata['notify'], 'url' => $userdata['url'], "hide" => ($userdata['hidewall'] || !$userdata['net-publish']), 'nick' => $userdata['nickname'], 'addr' => $userdata['addr'], - "connect" => $userdata['addr'], "server_url" => System::baseUrl(), + "connect" => $userdata['addr'], "server_url" => DI::baseUrl(), "generation" => 1, 'network' => Protocol::DFRN]; self::update($gcontact); @@ -1182,7 +1182,7 @@ class GContact 'addr' => $user->nickname . '@' . $hostname, 'nick' => $user->nickname, "network" => Protocol::OSTATUS, - 'photo' => System::baseUrl() . '/images/person-300.jpg']; + 'photo' => DI::baseUrl() . '/images/person-300.jpg']; if (isset($user->bio)) { $contact['about'] = $user->bio; diff --git a/src/Model/Item.php b/src/Model/Item.php index d521e4ca5e..c9d71e8c1e 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1564,7 +1564,7 @@ class Item $item['edited'] = DateTimeFormat::utcNow(); } - $item['plink'] = ($item['plink'] ?? '') ?: System::baseUrl() . '/display/' . urlencode($item['guid']); + $item['plink'] = ($item['plink'] ?? '') ?: DI::baseUrl() . '/display/' . urlencode($item['guid']); $default = ['url' => $item['author-link'], 'name' => $item['author-name'], 'photo' => $item['author-avatar'], 'network' => $item['network']]; @@ -2592,10 +2592,10 @@ class Item // All hashtags should point to the home server if "local_tags" is activated if (Config::get('system', 'local_tags')) { $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - "#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]); + "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]); $item["tag"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - "#[url=".System::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]); + "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["tag"]); } // mask hashtags inside of url, bookmarks and attachments to avoid urls in urls @@ -2624,7 +2624,7 @@ class Item } $basetag = str_replace('_',' ',substr($tag,1)); - $newtag = '#[url=' . System::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; + $newtag = '#[url=' . DI::baseUrl() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; $item["body"] = str_replace($tag, $newtag, $item["body"]); @@ -2676,13 +2676,13 @@ class Item return false; } - $link = Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']); + $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']); /* * Diaspora uses their own hardwired link URL in @-tags * instead of the one we supply with webfinger */ - $dlink = Strings::normaliseLink(System::baseUrl() . '/u/' . $user['nickname']); + $dlink = Strings::normaliseLink(DI::baseUrl() . '/u/' . $user['nickname']); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { @@ -2852,7 +2852,7 @@ class Item } Logger::log('check for photos', Logger::DEBUG); - $site = substr(System::baseUrl(), strpos(System::baseUrl(), '://')); + $site = substr(DI::baseUrl(), strpos(DI::baseUrl(), '://')); $orig_body = $s; $new_body = ''; diff --git a/src/Model/Mail.php b/src/Model/Mail.php index e77d147caa..ec333ed436 100644 --- a/src/Model/Mail.php +++ b/src/Model/Mail.php @@ -9,6 +9,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Core\Worker; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Model\Photo; use Friendica\Database\DBA; @@ -148,7 +149,7 @@ class Mail $recip_host = substr($recip_host, 0, strpos($recip_host, '/')); $recip_handle = (($contact['addr']) ? $contact['addr'] : $contact['nick'] . '@' . $recip_host); - $sender_handle = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $sender_handle = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); $conv_guid = System::createUUID(); $convuri = $recip_handle . ':' . $conv_guid; @@ -214,7 +215,7 @@ class Mail $images = $match[1]; if (count($images)) { foreach ($images as $image) { - if (!stristr($image, System::baseUrl() . '/photo/')) { + if (!stristr($image, DI::baseUrl() . '/photo/')) { continue; } $image_uri = substr($image, strrpos($image, '/') + 1); @@ -262,7 +263,7 @@ class Mail $conv_guid = System::createUUID(); - $recip_handle = $recipient['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $recip_handle = $recipient['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); $sender_nick = basename($replyto); $sender_host = substr($replyto, strpos($replyto, '://') + 3); diff --git a/src/Model/Photo.php b/src/Model/Photo.php index dd49892240..eee8fbc5f7 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -456,9 +456,9 @@ class Photo $suffix = "?ts=" . time(); - $image_url = System::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix; - $thumb = System::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix; - $micro = System::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix; + $image_url = DI::baseUrl() . "/photo/" . $resource_id . "-4." . $Image->getExt() . $suffix; + $thumb = DI::baseUrl() . "/photo/" . $resource_id . "-5." . $Image->getExt() . $suffix; + $micro = DI::baseUrl() . "/photo/" . $resource_id . "-6." . $Image->getExt() . $suffix; // Remove the cached photo $a = \get_app(); @@ -487,9 +487,9 @@ class Photo } if ($photo_failure) { - $image_url = System::baseUrl() . "/images/person-300.jpg"; - $thumb = System::baseUrl() . "/images/person-80.jpg"; - $micro = System::baseUrl() . "/images/person-48.jpg"; + $image_url = DI::baseUrl() . "/images/person-300.jpg"; + $thumb = DI::baseUrl() . "/images/person-80.jpg"; + $micro = DI::baseUrl() . "/images/person-48.jpg"; } return [$image_url, $thumb, $micro]; @@ -622,7 +622,7 @@ class Photo } foreach ($images as $image) { - if (!stristr($image, System::baseUrl() . '/photo/')) { + if (!stristr($image, DI::baseUrl() . '/photo/')) { continue; } $image_uri = substr($image,strrpos($image,'/') + 1); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index af903e7458..765fed791a 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -20,8 +20,6 @@ use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Core\System; -use Friendica\Core\Theme; -use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Protocol\Activity; @@ -396,7 +394,7 @@ class Profile // show edit profile to yourself if (!$is_contact && $local_user_is_self) { if (Feature::isEnabled(local_user(), 'multi_profiles')) { - $profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')]; + $profile['edit'] = [DI::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')]; $r = q( "SELECT * FROM `profile` WHERE `uid` = %d", local_user() @@ -422,7 +420,7 @@ class Profile } } } else { - $profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')]; + $profile['edit'] = [DI::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')]; $profile['menu'] = [ 'chg_photo' => L10n::t('Change profile photo'), 'cr_new' => null, @@ -461,7 +459,7 @@ class Profile if (!empty($profile['guid'])) { $diaspora = [ 'guid' => $profile['guid'], - 'podloc' => System::baseUrl(), + 'podloc' => DI::baseUrl(), 'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'), 'nickname' => $profile['nickname'], 'fullname' => $profile['name'], @@ -879,7 +877,7 @@ class Profile } if ($a->profile['uid'] == local_user()) { - $profile['edit'] = [System::baseUrl() . '/profiles/' . $a->profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')]; + $profile['edit'] = [DI::baseUrl() . '/profiles/' . $a->profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')]; } return Renderer::replaceMacros($tpl, [ @@ -907,7 +905,7 @@ class Profile $nickname = $a->user['nickname']; } - $baseProfileUrl = System::baseUrl() . '/profile/' . $nickname; + $baseProfileUrl = DI::baseUrl() . '/profile/' . $nickname; $tabs = [ [ @@ -928,7 +926,7 @@ class Profile ], [ 'label' => L10n::t('Photos'), - 'url' => System::baseUrl() . '/photos/' . $nickname, + 'url' => DI::baseUrl() . '/photos/' . $nickname, 'sel' => $current == 'photos' ? 'active' : '', 'title' => L10n::t('Photo Albums'), 'id' => 'photo-tab', @@ -936,7 +934,7 @@ class Profile ], [ 'label' => L10n::t('Videos'), - 'url' => System::baseUrl() . '/videos/' . $nickname, + 'url' => DI::baseUrl() . '/videos/' . $nickname, 'sel' => $current == 'videos' ? 'active' : '', 'title' => L10n::t('Videos'), 'id' => 'video-tab', @@ -948,7 +946,7 @@ class Profile if ($is_owner && $a->theme_events_in_profile) { $tabs[] = [ 'label' => L10n::t('Events'), - 'url' => System::baseUrl() . '/events', + 'url' => DI::baseUrl() . '/events', 'sel' => $current == 'events' ? 'active' : '', 'title' => L10n::t('Events and Calendar'), 'id' => 'events-tab', @@ -959,7 +957,7 @@ class Profile } elseif (!$is_owner) { $tabs[] = [ 'label' => L10n::t('Events'), - 'url' => System::baseUrl() . '/cal/' . $nickname, + 'url' => DI::baseUrl() . '/cal/' . $nickname, 'sel' => $current == 'cal' ? 'active' : '', 'title' => L10n::t('Events and Calendar'), 'id' => 'events-tab', @@ -970,7 +968,7 @@ class Profile if ($is_owner) { $tabs[] = [ 'label' => L10n::t('Personal Notes'), - 'url' => System::baseUrl() . '/notes', + 'url' => DI::baseUrl() . '/notes', 'sel' => $current == 'notes' ? 'active' : '', 'title' => L10n::t('Only You Can See This'), 'id' => 'notes-tab', @@ -981,7 +979,7 @@ class Profile if (!empty($_SESSION['new_member']) && $is_owner) { $tabs[] = [ 'label' => L10n::t('Tips for New Members'), - 'url' => System::baseUrl() . '/newmember', + 'url' => DI::baseUrl() . '/newmember', 'sel' => false, 'title' => L10n::t('Tips for New Members'), 'id' => 'newmember-tab', diff --git a/src/Model/Term.php b/src/Model/Term.php index 01169c5226..08a02ff075 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -6,8 +6,8 @@ namespace Friendica\Model; use Friendica\Core\Cache; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Util\Strings; /** @@ -208,7 +208,7 @@ class Term */ public static function insertFromTagFieldByItemId($item_id, $tag_str) { - $profile_base = System::baseUrl(); + $profile_base = DI::baseUrl(); $profile_data = parse_url($profile_base); $profile_path = $profile_data['path'] ?? ''; $profile_base_friendica = $profile_data['host'] . $profile_path . '/profile/'; @@ -425,7 +425,7 @@ class Term 'implicit_mentions' => [], ]; - $searchpath = System::baseUrl() . "/search?tag="; + $searchpath = DI::baseUrl() . "/search?tag="; $taglist = DBA::select( 'term', diff --git a/src/Model/User.php b/src/Model/User.php index 22a8b04744..b2b60d4362 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -217,12 +217,12 @@ class User // Check if the returned data is valid, otherwise fix it. See issue #6122 // Check for correct url and normalised nurl - $url = System::baseUrl() . '/profile/' . $r['nickname']; + $url = DI::baseUrl() . '/profile/' . $r['nickname']; $repair = ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url'])); if (!$repair) { // Check if "addr" is present and correct - $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3); + $addr = $r['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3); $repair = ($addr != $r['addr']); } @@ -635,7 +635,7 @@ class User $openid = new LightOpenID(DI::baseUrl()->getHostname()); $openid->identity = $openid_url; - $openid->returnUrl = System::baseUrl() . '/openid'; + $openid->returnUrl = DI::baseUrl() . '/openid'; $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson']; $openid->optional = ['namePerson/first', 'media/image/aspect11', 'media/image/default']; try { @@ -782,8 +782,8 @@ class User $insert_result = DBA::insert('profile', [ 'uid' => $uid, 'name' => $username, - 'photo' => System::baseUrl() . "/photo/profile/{$uid}.jpg", - 'thumb' => System::baseUrl() . "/photo/avatar/{$uid}.jpg", + 'photo' => DI::baseUrl() . "/photo/profile/{$uid}.jpg", + 'thumb' => DI::baseUrl() . "/photo/avatar/{$uid}.jpg", 'publish' => $publish, 'is-default' => 1, 'net-publish' => $netpublish, diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 85590d0c66..98aa46a8b4 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -14,7 +14,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -970,7 +969,7 @@ class Contact extends BaseModule $profiledata = Model\Contact::getDetailsByURL($contact['url']); if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) { - $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']); + $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']); } Model\Profile::load($a, '', 0, $profiledata, true); diff --git a/src/Module/Objects.php b/src/Module/Objects.php index e2f21af1a5..e03baaad7e 100644 --- a/src/Module/Objects.php +++ b/src/Module/Objects.php @@ -5,7 +5,6 @@ namespace Friendica\Module; use Friendica\BaseModule; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; @@ -38,7 +37,7 @@ class Objects extends BaseModule // If no original post could be found, it could possibly be a forum post, there we remove the "origin" field. // @TODO: Replace with parameter from router $item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]); - if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) { + if (!DBA::isResult($item) || !strstr($item['author-link'], DI::baseUrl())) { throw new \Friendica\Network\HTTPException\NotFoundException(); } } diff --git a/src/Module/Profile.php b/src/Module/Profile.php index 3fe28a0b91..6261ed955d 100644 --- a/src/Module/Profile.php +++ b/src/Module/Profile.php @@ -118,19 +118,19 @@ class Profile extends BaseModule $page['htmlhead'] .= '' . "\n"; } - $page['htmlhead'] .= '' . "\n"; - $page['htmlhead'] .= '' . "\n"; - $page['htmlhead'] .= '' . "\n"; - $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; $uri = urlencode('acct:' . $a->profile['nickname'] . '@' . DI::baseUrl()->getHostname() . (DI::baseUrl()->getUrlPath() ? '/' . DI::baseUrl()->getUrlPath() : '')); - $page['htmlhead'] .= '' . "\n"; - header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); + $page['htmlhead'] .= '' . "\n"; + header('Link: <' . DI::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false); $dfrn_pages = ['request', 'confirm', 'notify', 'poll']; foreach ($dfrn_pages as $dfrn) { - $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; } - $page['htmlhead'] .= '' . "\n"; + $page['htmlhead'] .= '' . "\n"; } $category = $datequery = $datequery2 = ''; @@ -193,8 +193,8 @@ class Profile extends BaseModule $commpage = $a->profile['page-flags'] == User::PAGE_FLAGS_COMMUNITY; $commvisitor = $commpage && $remote_contact; - DI::page()['aside'] .= Widget::postedByYear(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'] ?? 0, true); - DI::page()['aside'] .= Widget::categories(System::baseUrl(true) . '/profile/' . $a->profile['nickname'], XML::escape($category)); + DI::page()['aside'] .= Widget::postedByYear(DI::baseUrl()->get(true) . '/profile/' . $a->profile['nickname'], $a->profile['profile_uid'] ?? 0, true); + DI::page()['aside'] .= Widget::categories(DI::baseUrl()->get(true) . '/profile/' . $a->profile['nickname'], XML::escape($category)); DI::page()['aside'] .= Widget::tagCloud(); if (Security::canWriteToUserWall($a->profile['profile_uid'])) { diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php index 9884876566..de3e100382 100644 --- a/src/Module/Settings/Delegation.php +++ b/src/Module/Settings/Delegation.php @@ -8,7 +8,6 @@ use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Core\Session; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -71,7 +70,7 @@ class Delegation extends BaseSettingsModule if (DBA::isResult($user)) { $condition = [ 'uid' => local_user(), - 'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']) + 'nurl' => Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']) ]; if (DBA::exists('contact', $condition)) { DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]); @@ -109,7 +108,7 @@ class Delegation extends BaseSettingsModule ['nurl'], [ "`self` = 0 AND SUBSTRING_INDEX(`nurl`, '/', 3) = ? AND `uid` = ? AND `network` = ?", - Strings::normaliseLink(System::baseUrl()), + Strings::normaliseLink(DI::baseUrl()), local_user(), Protocol::DFRN, ] @@ -158,7 +157,7 @@ class Delegation extends BaseSettingsModule '$submit' => L10n::t('Save Settings'), '$header' => L10n::t('Delegate Page Management'), '$delegates_header' => L10n::t('Delegates'), - '$base' => System::baseUrl(), + '$base' => DI::baseUrl(), '$desc' => L10n::t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'), '$head_delegates' => L10n::t('Existing Page Delegates'), '$delegates' => $delegates, diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index 6c06f1133c..1b7c723a72 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -6,12 +6,9 @@ namespace Friendica\Module\Settings; use Friendica\App; -use Friendica\App\Arguments; -use Friendica\BaseModule; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Database\DBStructure; use Friendica\DI; @@ -196,7 +193,7 @@ class UserExport extends BaseSettingsModule $output = [ 'version' => FRIENDICA_VERSION, 'schema' => DB_UPDATE_VERSION, - 'baseurl' => System::baseUrl(), + 'baseurl' => DI::baseUrl(), 'user' => $user, 'contact' => $contact, 'profile' => $profile, diff --git a/src/Module/Tos.php b/src/Module/Tos.php index b28c98de7b..c64304628a 100644 --- a/src/Module/Tos.php +++ b/src/Module/Tos.php @@ -12,7 +12,6 @@ use Friendica\BaseModule; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Content\Text\BBCode; use Friendica\DI; @@ -35,7 +34,7 @@ class Tos extends BaseModule { $this->privacy_operate = L10n::t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'); $this->privacy_distribute = L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'); - $this->privacy_delete = L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl()); + $this->privacy_delete = L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseurl()); // In some cases we don't need every single one of the above separate, but all in one block. // So here is an array to look over $this->privacy_complete = [L10n::t('Privacy Statement'), $this->privacy_operate, $this->privacy_distribute, $this->privacy_delete]; @@ -77,7 +76,7 @@ class Tos extends BaseModule '$privstatementtitle' => L10n::t('Privacy Statement'), '$privacy_operate' => L10n::t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'), '$privacy_distribute' => L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'), - '$privacy_delete' => L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl()) + '$privacy_delete' => L10n::t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseurl()) ]); } else { return; diff --git a/src/Network/Probe.php b/src/Network/Probe.php index 735c6a7434..dac0822a94 100644 --- a/src/Network/Probe.php +++ b/src/Network/Probe.php @@ -15,7 +15,6 @@ use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -373,7 +372,7 @@ class Probe if (!empty($data['photo']) && !empty($data['baseurl'])) { $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink($data['baseurl']), Strings::normaliseLink($data['photo'])); } elseif (empty($data['photo'])) { - $data['photo'] = System::baseUrl() . '/images/person-300.jpg'; + $data['photo'] = DI::baseUrl() . '/images/person-300.jpg'; } if (empty($data['name'])) { diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index d345340f85..d5dfc14fc0 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -60,7 +60,7 @@ class Transmitter $count = DBA::count('contact', $condition); $data = ['@context' => ActivityPub::CONTEXT]; - $data['id'] = System::baseUrl() . '/followers/' . $owner['nickname']; + $data['id'] = DI::baseUrl() . '/followers/' . $owner['nickname']; $data['type'] = 'OrderedCollection'; $data['totalItems'] = $count; @@ -71,7 +71,7 @@ class Transmitter } if (empty($page)) { - $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1'; + $data['first'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1'; } else { $data['type'] = 'OrderedCollectionPage'; $list = []; @@ -82,10 +82,10 @@ class Transmitter } if (!empty($list)) { - $data['next'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1); + $data['next'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1); } - $data['partOf'] = System::baseUrl() . '/followers/' . $owner['nickname']; + $data['partOf'] = DI::baseUrl() . '/followers/' . $owner['nickname']; $data['orderedItems'] = $list; } @@ -109,7 +109,7 @@ class Transmitter $count = DBA::count('contact', $condition); $data = ['@context' => ActivityPub::CONTEXT]; - $data['id'] = System::baseUrl() . '/following/' . $owner['nickname']; + $data['id'] = DI::baseUrl() . '/following/' . $owner['nickname']; $data['type'] = 'OrderedCollection'; $data['totalItems'] = $count; @@ -120,7 +120,7 @@ class Transmitter } if (empty($page)) { - $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1'; + $data['first'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=1'; } else { $data['type'] = 'OrderedCollectionPage'; $list = []; @@ -131,10 +131,10 @@ class Transmitter } if (!empty($list)) { - $data['next'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1); + $data['next'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1); } - $data['partOf'] = System::baseUrl() . '/following/' . $owner['nickname']; + $data['partOf'] = DI::baseUrl() . '/following/' . $owner['nickname']; $data['orderedItems'] = $list; } @@ -162,12 +162,12 @@ class Transmitter $count = DBA::count('item', $condition); $data = ['@context' => ActivityPub::CONTEXT]; - $data['id'] = System::baseUrl() . '/outbox/' . $owner['nickname']; + $data['id'] = DI::baseUrl() . '/outbox/' . $owner['nickname']; $data['type'] = 'OrderedCollection'; $data['totalItems'] = $count; if (empty($page)) { - $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1'; + $data['first'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1'; } else { $data['type'] = 'OrderedCollectionPage'; $list = []; @@ -184,10 +184,10 @@ class Transmitter } if (!empty($list)) { - $data['next'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1); + $data['next'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1); } - $data['partOf'] = System::baseUrl() . '/outbox/' . $owner['nickname']; + $data['partOf'] = DI::baseUrl() . '/outbox/' . $owner['nickname']; $data['orderedItems'] = $list; } @@ -240,10 +240,10 @@ class Transmitter $data['id'] = $contact['url']; $data['diaspora:guid'] = $user['guid']; $data['type'] = ActivityPub::ACCOUNT_TYPES[$user['account-type']]; - $data['following'] = System::baseUrl() . '/following/' . $user['nickname']; - $data['followers'] = System::baseUrl() . '/followers/' . $user['nickname']; - $data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname']; - $data['outbox'] = System::baseUrl() . '/outbox/' . $user['nickname']; + $data['following'] = DI::baseUrl() . '/following/' . $user['nickname']; + $data['followers'] = DI::baseUrl() . '/followers/' . $user['nickname']; + $data['inbox'] = DI::baseUrl() . '/inbox/' . $user['nickname']; + $data['outbox'] = DI::baseUrl() . '/outbox/' . $user['nickname']; $data['preferredUsername'] = $user['nickname']; $data['name'] = $contact['name']; $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'], @@ -254,7 +254,7 @@ class Transmitter $data['publicKey'] = ['id' => $contact['url'] . '#main-key', 'owner' => $contact['url'], 'publicKeyPem' => $user['pubkey']]; - $data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox']; + $data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox']; $data['icon'] = ['type' => 'Image', 'url' => $contact['photo']]; @@ -273,7 +273,7 @@ class Transmitter { return [ '@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/profile/' . $username, + 'id' => DI::baseUrl() . '/profile/' . $username, 'type' => 'Tombstone', 'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM), 'updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM), @@ -983,7 +983,7 @@ class Transmitter $terms = Term::tagArrayFromItemId($item['id'], [Term::HASHTAG, Term::MENTION, Term::IMPLICIT_MENTION]); foreach ($terms as $term) { if ($term['type'] == Term::HASHTAG) { - $url = System::baseUrl() . '/search?tag=' . urlencode($term['term']); + $url = DI::baseUrl() . '/search?tag=' . urlencode($term['term']); $tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']]; } elseif ($term['type'] == Term::MENTION || $term['type'] == Term::IMPLICIT_MENTION) { $contact = Contact::getDetailsByURL($term['url']); @@ -1460,7 +1460,7 @@ class Transmitter $hash = hash('ripemd128', $contact['uid'].'-'.$contact['id'].'-'.$contact['created']); $uuid = substr($hash, 0, 8). '-' . substr($hash, 8, 4) . '-' . substr($hash, 12, 4) . '-' . substr($hash, 16, 4) . '-' . substr($hash, 20, 12); - return System::baseUrl() . '/activity/' . $uuid; + return DI::baseUrl() . '/activity/' . $uuid; } /** @@ -1480,7 +1480,7 @@ class Transmitter $suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]); $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'Announce', 'actor' => $owner['url'], 'object' => $suggestion['url'], @@ -1509,7 +1509,7 @@ class Transmitter $owner = User::getOwnerDataById($uid); $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'dfrn:relocate', 'actor' => $owner['url'], 'object' => $owner['url'], @@ -1548,7 +1548,7 @@ class Transmitter } $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'Delete', 'actor' => $owner['url'], 'object' => $owner['url'], @@ -1579,7 +1579,7 @@ class Transmitter $profile = APContact::getByURL($owner['url']); $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'Update', 'actor' => $owner['url'], 'object' => self::getProfile($uid), @@ -1616,7 +1616,7 @@ class Transmitter $owner = User::getOwnerDataById($uid); if (empty($id)) { - $id = System::baseUrl() . '/activity/' . System::createGUID(); + $id = DI::baseUrl() . '/activity/' . System::createGUID(); } $data = ['@context' => ActivityPub::CONTEXT, @@ -1673,7 +1673,7 @@ class Transmitter $owner = User::getOwnerDataById($uid); $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'Follow', 'actor' => $owner['url'], 'object' => $object, @@ -1705,7 +1705,7 @@ class Transmitter $owner = User::getOwnerDataById($uid); $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'Accept', 'actor' => $owner['url'], 'object' => [ @@ -1742,7 +1742,7 @@ class Transmitter $owner = User::getOwnerDataById($uid); $data = ['@context' => ActivityPub::CONTEXT, - 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'id' => DI::baseUrl() . '/activity/' . System::createGUID(), 'type' => 'Reject', 'actor' => $owner['url'], 'object' => [ @@ -1782,7 +1782,7 @@ class Transmitter return; } - $id = System::baseUrl() . '/activity/' . System::createGUID(); + $id = DI::baseUrl() . '/activity/' . System::createGUID(); $owner = User::getOwnerDataById($uid); $data = ['@context' => ActivityPub::CONTEXT, diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index e058854c94..354653c9b9 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -18,7 +18,6 @@ use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -506,7 +505,7 @@ class DFRN $ext = Images::supportedTypes(); foreach ($rp as $p) { - $photos[$p['scale']] = System::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; + $photos[$p['scale']] = DI::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']]; } @@ -568,7 +567,7 @@ class DFRN $root->setAttribute("xmlns:ostatus", ActivityNamespace::OSTATUS); $root->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET); - XML::addElement($doc, $root, "id", System::baseUrl()."/profile/".$owner["nick"]); + XML::addElement($doc, $root, "id", DI::baseUrl()."/profile/".$owner["nick"]); XML::addElement($doc, $root, "title", $owner["name"]); $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION."-".DB_UPDATE_VERSION]; @@ -585,13 +584,13 @@ class DFRN // DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed. OStatus::hublinks($doc, $root, $owner["nick"]); - $attributes = ["rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]]; + $attributes = ["rel" => "salmon", "href" => DI::baseUrl()."/salmon/".$owner["nick"]]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => System::baseUrl()."/salmon/".$owner["nick"]]; + $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-replies", "href" => DI::baseUrl()."/salmon/".$owner["nick"]]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => System::baseUrl()."/salmon/".$owner["nick"]]; + $attributes = ["rel" => "http://salmon-protocol.org/ns/salmon-mention", "href" => DI::baseUrl()."/salmon/".$owner["nick"]]; XML::addElement($doc, $root, "link", "", $attributes); } @@ -652,7 +651,7 @@ class DFRN } XML::addElement($doc, $author, "name", $owner["name"], $attributes); - XML::addElement($doc, $author, "uri", System::baseUrl().'/profile/'.$owner["nickname"], $attributes); + XML::addElement($doc, $author, "uri", DI::baseUrl().'/profile/'.$owner["nickname"], $attributes); XML::addElement($doc, $author, "dfrn:handle", $owner["addr"], $attributes); $attributes = ["rel" => "photo", "type" => "image/jpeg", @@ -989,7 +988,7 @@ class DFRN } // Add conversation data. This is used for OStatus - $conversation_href = System::baseUrl()."/display/".$item["parent-guid"]; + $conversation_href = DI::baseUrl()."/display/".$item["parent-guid"]; $conversation_uri = $conversation_href; if (isset($parent_item)) { @@ -1030,7 +1029,7 @@ class DFRN "link", "", ["rel" => "alternate", "type" => "text/html", - "href" => System::baseUrl() . "/display/" . $item["guid"]] + "href" => DI::baseUrl() . "/display/" . $item["guid"]] ); // "comment-allow" is some old fashioned stuff for old Friendica versions. @@ -1901,7 +1900,7 @@ class DFRN 'to_email' => $importer['email'], 'uid' => $importer['importer_uid'], 'item' => $suggest, - 'link' => System::baseUrl().'/notifications/intros', + 'link' => DI::baseUrl().'/notifications/intros', 'source_name' => $importer['name'], 'source_link' => $importer['url'], 'source_photo' => $importer['photo'], @@ -2129,7 +2128,7 @@ class DFRN } } - if ($Blink && Strings::compareLink($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) { + if ($Blink && Strings::compareLink($Blink, DI::baseUrl() . "/profile/" . $importer["nickname"])) { $author = DBA::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item['author-id']]); $parent = Item::selectFirst(['id'], ['uri' => $item['parent-uri'], 'uid' => $importer["importer_uid"]]); @@ -2145,7 +2144,7 @@ class DFRN "to_email" => $importer["email"], "uid" => $importer["importer_uid"], "item" => $item, - "link" => System::baseUrl()."/display/".urlencode($item['guid']), + "link" => DI::baseUrl()."/display/".urlencode($item['guid']), "source_name" => $author["name"], "source_link" => $author["url"], "source_photo" => $author["thumb"], @@ -2886,13 +2885,13 @@ class DFRN $community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY); $prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP); - $link = Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']); + $link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']); /* * Diaspora uses their own hardwired link URL in @-tags * instead of the one we supply with webfinger */ - $dlink = Strings::normaliseLink(System::baseUrl() . '/u/' . $user['nickname']); + $dlink = Strings::normaliseLink(DI::baseUrl() . '/u/' . $user['nickname']); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism', $item['body'], $matches, PREG_SET_ORDER); if ($cnt) { diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 7704d3f07b..dd8fab0a6d 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -22,17 +22,16 @@ use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\GContact; -use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\ItemDeliveryData; use Friendica\Model\Mail; use Friendica\Model\Profile; use Friendica\Model\User; use Friendica\Network\Probe; -use Friendica\Protocol\ActivityNamespace; use Friendica\Util\Crypto; use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; @@ -145,7 +144,7 @@ class Diaspora // Now we are collecting all relay contacts foreach ($serverlist as $server_url) { // We don't send messages to ourselves - if (Strings::compareLink($server_url, System::baseUrl())) { + if (Strings::compareLink($server_url, DI::baseUrl())) { continue; } $contact = self::getRelayContact($server_url); @@ -2670,7 +2669,7 @@ class Diaspora return false; } - $orig_url = System::baseUrl()."/display/".$original_item["guid"]; + $orig_url = DI::baseUrl()."/display/".$original_item["guid"]; $datarray = []; @@ -2996,7 +2995,7 @@ class Diaspora $nick = $contact["nick"]; } - return $nick . "@" . substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3); + return $nick . "@" . substr(DI::baseUrl(), strpos(DI::baseUrl(), "://") + 3); } @@ -4117,9 +4116,9 @@ class Diaspora $first = $split_name['first']; $last = $split_name['last']; - $large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg'; - $medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg'; - $small = System::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg'; + $large = DI::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg'; + $medium = DI::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg'; + $small = DI::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg'; $searchable = (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false'); $dob = null; diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index acdd168ed4..ef90c40a2a 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -11,11 +11,9 @@ use DOMXPath; use Friendica\Content\Text\HTML; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Item; -use Friendica\Protocol\ActivityNamespace; use Friendica\Util\ParseUrl; use Friendica\Util\Network; use Friendica\Util\XML; @@ -353,7 +351,7 @@ class Feed { $tags .= ', '; } - $taglink = "#[url=" . System::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]"; + $taglink = "#[url=" . DI::baseUrl() . "/search?tag=" . $hashtag . "]" . $hashtag . "[/url]"; $tags .= $taglink; } diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index bd045c0200..c78380bb49 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -15,7 +15,6 @@ use Friendica\Core\Lock; use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\APContact; @@ -25,8 +24,6 @@ use Friendica\Model\GContact; use Friendica\Model\Item; use Friendica\Model\User; use Friendica\Network\Probe; -use Friendica\Object\Image; -use Friendica\Protocol\ActivityNamespace; use Friendica\Util\DateTimeFormat; use Friendica\Util\Images; use Friendica\Util\Network; @@ -649,7 +646,7 @@ class OStatus $item['tag'] = ''; } - $item['tag'] .= '#[url=' . System::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]'; + $item['tag'] .= '#[url=' . DI::baseUrl() . '/search?tag=' . $term . ']' . $term . '[/url]'; } } } @@ -1293,7 +1290,7 @@ class OStatus $attributes = ["uri" => "https://friendi.ca", "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION]; XML::addElement($doc, $root, "generator", FRIENDICA_PLATFORM, $attributes); - XML::addElement($doc, $root, "id", System::baseUrl() . "/profile/" . $owner["nick"]); + XML::addElement($doc, $root, "id", DI::baseUrl() . "/profile/" . $owner["nick"]); XML::addElement($doc, $root, "title", $title); XML::addElement($doc, $root, "subtitle", sprintf("Updates from %s on %s", $owner["name"], Config::get('config', 'sitename'))); XML::addElement($doc, $root, "logo", $owner["photo"]); @@ -1313,16 +1310,16 @@ class OStatus self::hublinks($doc, $root, $owner["nick"]); - $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"]; + $attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "salmon"]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"]; + $attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-replies"]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["href" => System::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"]; + $attributes = ["href" => DI::baseUrl() . "/salmon/" . $owner["nick"], "rel" => "http://salmon-protocol.org/ns/salmon-mention"]; XML::addElement($doc, $root, "link", "", $attributes); - $attributes = ["href" => System::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"]; + $attributes = ["href" => DI::baseUrl() . $selfUri, "rel" => "self", "type" => "application/atom+xml"]; XML::addElement($doc, $root, "link", "", $attributes); if ($owner['account-type'] == Contact::TYPE_COMMUNITY) { @@ -1346,7 +1343,7 @@ class OStatus */ public static function hublinks(DOMDocument $doc, $root, $nick) { - $h = System::baseUrl() . '/pubsubhubbub/'.$nick; + $h = DI::baseUrl() . '/pubsubhubbub/'.$nick; XML::addElement($doc, $root, "link", "", ["href" => $h, "rel" => "hub"]); } @@ -1492,7 +1489,7 @@ class OStatus $author->appendChild($urls); } - XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]); + XML::addElement($doc, $author, "followers", "", ["url" => DI::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]); XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]); if ($profile["publish"]) { @@ -1980,7 +1977,7 @@ class OStatus XML::addElement($doc, $entry, "content", $body, ["type" => "html"]); XML::addElement($doc, $entry, "link", "", ["rel" => "alternate", "type" => "text/html", - "href" => System::baseUrl()."/display/".$item["guid"]] + "href" => DI::baseUrl()."/display/".$item["guid"]] ); if (!$feed_mode && $complete && ($item["id"] > 0)) { @@ -2024,7 +2021,7 @@ class OStatus } else { $mentioned[$parent["author-link"]] = $parent["author-link"]; $mentioned[$parent["owner-link"]] = $parent["owner-link"]; - $parent_plink = System::baseUrl()."/display/".$parent["guid"]; + $parent_plink = DI::baseUrl()."/display/".$parent["guid"]; } $attributes = [ diff --git a/src/Util/Network.php b/src/Util/Network.php index b19c8af504..1f16d9a724 100644 --- a/src/Util/Network.php +++ b/src/Util/Network.php @@ -556,7 +556,7 @@ class Network Hook::callAll('avatar_lookup', $avatar); if (! $avatar['success']) { - $avatar['url'] = System::baseUrl() . '/images/person-300.jpg'; + $avatar['url'] = DI::baseUrl() . '/images/person-300.jpg'; } Logger::log('Avatar: ' . $avatar['email'] . ' ' . $avatar['url'], Logger::DEBUG); diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php index dab08b18bb..4feb0b680f 100644 --- a/src/Util/Proxy.php +++ b/src/Util/Proxy.php @@ -3,7 +3,6 @@ namespace Friendica\Util; use Friendica\Core\Config; -use Friendica\Core\System; use Friendica\DI; /** @@ -76,7 +75,7 @@ class Proxy // Only continue if it isn't a local image and the isn't deactivated if (self::isLocalImage($url)) { - $url = str_replace(Strings::normaliseLink(System::baseUrl()) . '/', System::baseUrl() . '/', $url); + $url = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $url); return $url; } @@ -109,7 +108,7 @@ class Proxy $longpath .= '.' . $extension; } - $proxypath = System::baseUrl() . '/proxy/' . $longpath; + $proxypath = DI::baseUrl() . '/proxy/' . $longpath; if ($size != '') { $size = ':' . $size; @@ -120,7 +119,7 @@ class Proxy if ((strlen($proxypath) > 250) && $writemode) { return $shortpath; } elseif (strlen($proxypath) > 250) { - return System::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url); + return DI::baseUrl() . '/proxy/' . $shortpath . '?url=' . urlencode($url); } elseif ($writemode) { return $longpath; } else { @@ -141,7 +140,7 @@ class Proxy */ public static function proxifyHtml($html) { - $html = str_replace(Strings::normaliseLink(System::baseUrl()) . '/', System::baseUrl() . '/', $html); + $html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html); return preg_replace_callback('/(]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'self::replaceUrl', $html); } @@ -164,7 +163,7 @@ class Proxy } // links normalised - bug #431 - $baseurl = Strings::normaliseLink(System::baseUrl()); + $baseurl = Strings::normaliseLink(DI::baseUrl()); $url = Strings::normaliseLink($url); return (substr($url, 0, strlen($baseurl)) == $baseurl); diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php index ed2ff2979d..a2088fde5d 100644 --- a/src/Worker/Delivery.php +++ b/src/Worker/Delivery.php @@ -8,7 +8,6 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model; @@ -292,7 +291,7 @@ class Delivery // perform local delivery if we are on the same site - if (Strings::compareLink($basepath, System::baseUrl())) { + if (Strings::compareLink($basepath, DI::baseUrl())) { $condition = ['nurl' => Strings::normaliseLink($contact['url']), 'self' => true]; $target_self = DBA::selectFirst('contact', ['uid'], $condition); if (!DBA::isResult($target_self)) { diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php index df3776b48f..8e38ff8128 100644 --- a/src/Worker/PubSubPublish.php +++ b/src/Worker/PubSubPublish.php @@ -6,10 +6,9 @@ namespace Friendica\Worker; use Friendica\Core\Logger; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\PushSubscriber; -use Friendica\Model\GServer; use Friendica\Protocol\OStatus; use Friendica\Util\Network; @@ -47,7 +46,7 @@ class PubSubPublish $headers = ["Content-type: application/atom+xml", sprintf("Link: <%s>;rel=hub,<%s>;rel=self", - System::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'], + DI::baseUrl() . '/pubsubhubbub/' . $subscriber['nickname'], $subscriber['topic']), "X-Hub-Signature: sha1=" . $hmac_sig]; diff --git a/tests/include/ApiTest.php b/tests/include/ApiTest.php index 8fce36955d..6a5dde0c65 100644 --- a/tests/include/ApiTest.php +++ b/tests/include/ApiTest.php @@ -2418,7 +2418,7 @@ class ApiTest extends DatabaseTest public function testApiFormatItemsEmbededImages() { $this->assertEquals( - 'text ' . System::baseUrl() . '/display/item_guid', + 'text ' . DI::baseUrl() . '/display/item_guid', api_format_items_embeded_images(['guid' => 'item_guid'], 'text data:image/foo') ); } @@ -2921,7 +2921,7 @@ class ApiTest extends DatabaseTest $result = api_statusnet_config('json'); $this->assertEquals('localhost', $result['config']['site']['server']); $this->assertEquals('default', $result['config']['site']['theme']); - $this->assertEquals(System::baseUrl() . '/images/friendica-64.png', $result['config']['site']['logo']); + $this->assertEquals(DI::baseUrl() . '/images/friendica-64.png', $result['config']['site']['logo']); $this->assertTrue($result['config']['site']['fancy']); $this->assertEquals('en', $result['config']['site']['language']); $this->assertEquals('UTC', $result['config']['site']['timezone']); diff --git a/view/php/default.php b/view/php/default.php index dc124a8454..1280843ca4 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -2,7 +2,7 @@ <?php if(!empty($page['title'])) echo $page['title'] ?> - + diff --git a/view/php/minimal.php b/view/php/minimal.php index caa6c64d96..7b8ac61af0 100644 --- a/view/php/minimal.php +++ b/view/php/minimal.php @@ -2,7 +2,7 @@ <?php if(!empty($page['title'])) echo $page['title'] ?> - + diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index 5579680a33..fe08a43fb8 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -30,7 +30,7 @@ $is_singleuser_class = $is_singleuser ? "is-singleuser" : "is-not-singleuser"; <?php if (!empty($page['title'])) echo $page['title'] ?> - + - - - <?php if(!empty($page['title'])) echo $page['title'] ?> - - - - -
-
-
- - - - - + + + + <?php if(!empty($page['title'])) echo $page['title'] ?> + + + + +
+
+
+ + + + + diff --git a/view/theme/frio/php/standard.php b/view/theme/frio/php/standard.php index 00555192c8..bed948b9fd 100644 --- a/view/theme/frio/php/standard.php +++ b/view/theme/frio/php/standard.php @@ -10,9 +10,9 @@ <?php if(!empty($page['title'])) echo $page['title'] ?> - + - + diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php index e82b9f2d8f..d54517de71 100644 --- a/view/theme/quattro/theme.php +++ b/view/theme/quattro/theme.php @@ -8,10 +8,9 @@ */ use Friendica\App; -use Friendica\Core\System; use Friendica\DI; function quattro_init(App $a) { - DI::page()['htmlhead'] .= ''; - DI::page()['htmlhead'] .= '';; + DI::page()['htmlhead'] .= ''; + DI::page()['htmlhead'] .= '';; } diff --git a/view/theme/smoothly/php/default.php b/view/theme/smoothly/php/default.php index b0d8a7e31f..74cf4a3630 100644 --- a/view/theme/smoothly/php/default.php +++ b/view/theme/smoothly/php/default.php @@ -2,7 +2,7 @@ <?php if(!empty($page['title'])) echo $page['title'] ?> - +