From 335fcf670f35f577eacf1050b223641b60bbb35c Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 01:05:14 +0100 Subject: [PATCH] Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get() --- blockem/blockem.php | 5 ++-- blogger/blogger.php | 3 ++- buffer/buffer.php | 11 ++++---- catavatar/catavatar.php | 7 ++--- curweather/curweather.php | 3 ++- diaspora/diaspora.php | 2 +- dwpost/dwpost.php | 3 ++- ifttt/ifttt.php | 3 ++- jappixmini/jappixmini.php | 23 ++++++++-------- langfilter/langfilter.php | 3 ++- mailstream/mailstream.php | 3 ++- notifyall/notifyall.php | 2 +- pumpio/pumpio.php | 12 ++++----- smileybutton/smileybutton.php | 51 ++++++++++++++++++----------------- statusnet/statusnet.php | 6 ++--- tumblr/tumblr.php | 9 ++++--- twitter/twitter.php | 8 +++--- widgets/widgets.php | 4 +-- xmpp/xmpp.php | 2 +- 19 files changed, 86 insertions(+), 74 deletions(-) diff --git a/blockem/blockem.php b/blockem/blockem.php index e0c0a74a..6d93de1d 100644 --- a/blockem/blockem.php +++ b/blockem/blockem.php @@ -11,6 +11,7 @@ use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; +use Friendica\DI; use Friendica\Util\Strings; function blockem_install() @@ -43,7 +44,7 @@ function blockem_addon_settings (App $a, &$s) } /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; $words = PConfig::get(local_user(), 'blockem', 'words'); @@ -148,7 +149,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data) function blockem_display_item(App $a, array &$b = null) { if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) { - $b['output']['thumb'] = $a->getBaseURL() . "/images/person-80.jpg"; + $b['output']['thumb'] = DI::baseUrl()->get() . "/images/person-80.jpg"; } } diff --git a/blogger/blogger.php b/blogger/blogger.php index 001224d2..049ee077 100644 --- a/blogger/blogger.php +++ b/blogger/blogger.php @@ -12,6 +12,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; +use Friendica\DI; use Friendica\Util\Network; use Friendica\Util\XML; @@ -68,7 +69,7 @@ function blogger_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/buffer/buffer.php b/buffer/buffer.php index 13b5309d..24357634 100644 --- a/buffer/buffer.php +++ b/buffer/buffer.php @@ -17,6 +17,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\ItemContent; use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; @@ -110,7 +111,7 @@ function buffer_connect(App $a) $client_secret = Config::get('buffer','client_secret'); // The callback URL is the script that gets called after the user authenticates with buffer - $callback_url = $a->getBaseURL()."/buffer/connect"; + $callback_url = DI::baseUrl()->get()."/buffer/connect"; $buffer = new BufferApp($client_id, $client_secret, $callback_url); @@ -119,7 +120,7 @@ function buffer_connect(App $a) } else { Logger::log("buffer_connect: authenticated"); $o = L10n::t("You are now authenticated to buffer. "); - $o .= '
' . L10n::t("return to the connector page") . ''; + $o .= '
' . L10n::t("return to the connector page") . ''; PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token); } @@ -152,7 +153,7 @@ function buffer_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -181,7 +182,7 @@ function buffer_settings(App $a, &$s) if ($access_token == "") { $s .= '
'; - $s .= ''.L10n::t("Authenticate your Buffer connection").''; + $s .= ''.L10n::t("Authenticate your Buffer connection").''; $s .= '
'; } else { $s .= '
'; @@ -200,7 +201,7 @@ function buffer_settings(App $a, &$s) $s .= '
'; // The callback URL is the script that gets called after the user authenticates with buffer - $callback_url = $a->getBaseURL() . '/buffer/connect'; + $callback_url = DI::baseUrl()->get() . '/buffer/connect'; $buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token); diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php index e70449af..b345ea4f 100644 --- a/catavatar/catavatar.php +++ b/catavatar/catavatar.php @@ -15,6 +15,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Worker; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Network\HTTPException\NotFoundException; @@ -84,7 +85,7 @@ function catavatar_addon_settings_post(App $a, &$s) $seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email'])))); if (!empty($_POST['catavatar-usecat'])) { - $url = $a->getBaseURL() . '/catavatar/' . local_user() . '?ts=' . time(); + $url = DI::baseUrl()->get() . '/catavatar/' . local_user() . '?ts=' . time(); $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]); if (!DBA::isResult($self)) { @@ -111,7 +112,7 @@ function catavatar_addon_settings_post(App $a, &$s) Contact::updateSelfFromUserID(local_user(), true); // Update global directory in background - $url = $a->getBaseURL() . '/profile/' . $a->user['nickname']; + $url = DI::baseUrl()->get() . '/profile/' . $a->user['nickname']; if ($url && strlen(Config::get('system', 'directory'))) { Worker::add(PRIORITY_LOW, 'Directory', $url); } @@ -140,7 +141,7 @@ function catavatar_addon_settings_post(App $a, &$s) function catavatar_lookup(App $a, &$b) { $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]); - $url = $a->getBaseURL() . '/catavatar/' . $user['uid']; + $url = DI::baseUrl()->get() . '/catavatar/' . $user['uid']; switch($b['size']) { case 300: $url .= "/4"; break; diff --git a/curweather/curweather.php b/curweather/curweather.php index df7a701a..533c83e0 100644 --- a/curweather/curweather.php +++ b/curweather/curweather.php @@ -17,6 +17,7 @@ use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\Session; +use Friendica\DI; use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; @@ -103,7 +104,7 @@ function curweather_network_mod_init(App $a, &$b) return; } - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; // $rpt value is needed for location // $lang will be taken from the browser session to honour user settings diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php index eb7e521b..06b54399 100644 --- a/diaspora/diaspora.php +++ b/diaspora/diaspora.php @@ -66,7 +66,7 @@ function diaspora_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php index ebba0232..5c13734b 100644 --- a/dwpost/dwpost.php +++ b/dwpost/dwpost.php @@ -15,6 +15,7 @@ use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\XML; @@ -63,7 +64,7 @@ function dwpost_settings(App $a, &$s) } /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ $enabled = PConfig::get(local_user(), 'dwpost', 'post'); diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 3bb55f35..c9e08696 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -14,6 +14,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Item; use Friendica\Util\Strings; @@ -63,7 +64,7 @@ function ifttt_settings(App $a, &$s) $s .= '
'; $s .= '

' . L10n::t('Create an account at IFTTT. Create three Facebook recipes that are connected with Maker (In the form "if Facebook then Maker") with the following parameters:') . '

'; $s .= '

URL

'; - $s .= '

' . $a->getBaseURL() . '/ifttt/' . $a->user['nickname'] . '

'; + $s .= '

' . DI::baseUrl()->get() . '/ifttt/' . $a->user['nickname'] . '

'; $s .= '

Method

'; $s .= '

POST

'; $s .= '

Content Type

'; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 8f0a1f71..1a768dea 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -70,6 +70,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Protocol; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\User; use Friendica\Util\Network; @@ -324,10 +325,10 @@ function jappixmini_settings(App $a, &$s) if (!$activate) { // load scripts if not yet activated so that password can be saved - $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; } $s .= ''; @@ -490,10 +491,10 @@ function jappixmini_script(App $a) return; } - $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; $username = PConfig::get(local_user(), 'jappixmini', 'username'); $username = str_replace("'", "\\'", $username); @@ -514,7 +515,7 @@ function jappixmini_script(App $a) // set proxy if necessary $use_proxy = Config::get('jappixmini', 'bosh_proxy'); if ($use_proxy) { - $proxy = $a->getBaseURL() . '/addon/jappixmini/proxy.php'; + $proxy = DI::baseUrl()->get() . '/addon/jappixmini/proxy.php'; } else { $proxy = ""; } @@ -569,10 +570,10 @@ function jappixmini_login(App $a, &$o) { // create client secret on login to be able to encrypt jabber passwords // for setDB and str_sha1, needed by jappixmini_addon_set_client_secret - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; // for jappixmini_addon_set_client_secret - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; // save hash of password $o = str_replace("
getBaseURL() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; - $b .= '

You can download the source code of the addon. The rest of Friendica is distributed under compatible licenses and can be retrieved from https://github.com/friendica/friendica and https://github.com/friendica/friendica-addons

'; + $b .= '

This site uses the jappixmini addon, which includes Jappix Mini by the Jappix authors and is distributed under the terms of the GNU Affero General Public License.

'; + $b .= '

You can download the source code of the addon. The rest of Friendica is distributed under compatible licenses and can be retrieved from https://github.com/friendica/friendica and https://github.com/friendica/friendica-addons

'; } diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 95021969..f4728c77 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -13,6 +13,7 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\PConfig; use Friendica\Core\Renderer; +use Friendica\DI; /* Define the hooks we want to use * that is, we have settings, we need to save the settings and we want @@ -122,7 +123,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) // Never filter own messages // TODO: find a better way to extract this - $logged_user_profile = $a->getBaseURL() . '/profile/' . $a->user['nickname']; + $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->user['nickname']; if ($logged_user_profile == $hook_data['item']['author-link']) { return; } diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php index d6d880f1..02e6dcb6 100644 --- a/mailstream/mailstream.php +++ b/mailstream/mailstream.php @@ -14,6 +14,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Protocol\Activity; use Friendica\Util\Network; use Friendica\Model\Item; @@ -306,7 +307,7 @@ function mailstream_send(\Friendica\App $a, $message_id, $item, $user) { $template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/'); $mail->AltBody = BBCode::toPlaintext($item['body']); $item['body'] = BBCode::convert($item['body']); - $item['url'] = $a->getBaseURL() . '/display/' . $item['guid']; + $item['url'] = DI::baseUrl()->get() . '/display/' . $item['guid']; $mail->Body = Renderer::replaceMacros($template, [ '$upstream' => L10n::t('Upstream'), '$local' => L10n::t('Local'), diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php index c470cb4e..92a1a2e3 100644 --- a/notifyall/notifyall.php +++ b/notifyall/notifyall.php @@ -32,7 +32,7 @@ function notifyall_module() {} function notifyall_addon_admin(App $a, &$o) { - $o = '
    ' . L10n::t('Send email to all members') . '
'; + $o = '
    ' . L10n::t('Send email to all members') . '
'; } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 18ab5f41..7c2149cf 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -115,8 +115,8 @@ function pumpio_registerclient(App $a, $host) $params["contacts"] = $adminlist[0]; $params["application_type"] = "native"; $params["application_name"] = $application_name; - $params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png"; - $params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect"; + $params["logo_url"] = DI::baseUrl()->get()."/images/friendica-256.png"; + $params["redirect_uris"] = DI::baseUrl()->get()."/pumpio/connect"; Logger::log("pumpio_registerclient: ".$url." parameters ".print_r($params, true), Logger::DEBUG); @@ -167,7 +167,7 @@ function pumpio_connect(App $a) } // The callback URL is the script that gets called after the user authenticates with pumpio - $callback_url = $a->getBaseURL()."/pumpio/connect"; + $callback_url = DI::baseUrl()->get()."/pumpio/connect"; // Let's begin. First we need a Request Token. The request token is required to send the user // to pumpio's login page. @@ -204,7 +204,7 @@ function pumpio_connect(App $a) if ($success) { Logger::log("pumpio_connect: authenticated"); $o = L10n::t("You are now authenticated to pumpio."); - $o .= '
'.L10n::t("return to the connector page").''; + $o .= '
'.L10n::t("return to the connector page").''; } else { Logger::log("pumpio_connect: could not connect"); $o = 'Could not connect to pumpio. Refresh the page or try again later.'; @@ -239,7 +239,7 @@ function pumpio_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -289,7 +289,7 @@ function pumpio_settings(App $a, &$s) $s .= '
'; if (($oauth_token == "") || ($oauth_token_secret == "")) { $s .= '
'; } else { $s .= '
'; diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php index 593eed8b..bdd7d951 100644 --- a/smileybutton/smileybutton.php +++ b/smileybutton/smileybutton.php @@ -7,6 +7,7 @@ */ use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\DI; function smileybutton_install() { //Register hooks @@ -70,29 +71,29 @@ function show_button(Friendica\App $a, &$b) { ]; $icons = [ - '<3', - '</3', - ':-)', - ';-)', - ':-(', - ':-P', - ':-X', - ':-D', - ':-O', - '\\o/', - 'O_o', - ':\'(', - ':-!', - ':-/', - ':-[', - '8-)', - ':beer', - ':coffee', - ':facepalm', - ':like', - ':dislike', - '~friendica', - 'red' + '<3', + '</3', + ':-)', + ';-)', + ':-(', + ':-P', + ':-X', + ':-D', + ':-O', + '\\o/', + 'O_o', + ':\'(', + ':-!', + ':-/', + ':-[', + '8-)', + ':beer', + ':coffee', + ':facepalm', + ':like', + ':dislike', + '~friendica', + 'red' ]; // Call hooks to get aditional smileies from other addons @@ -116,7 +117,7 @@ function show_button(Friendica\App $a, &$b) { $css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css'; if (! file_exists($css_file)) $css_file = 'addon/smileybutton/view/default.css'; - $css_url = $a->getBaseURL().'/'.$css_file; + $css_url = DI::baseUrl()->get().'/'.$css_file; $a->page['htmlhead'] .= ''."\r\n"; @@ -125,7 +126,7 @@ function show_button(Friendica\App $a, &$b) { $image = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.png'; if (! file_exists($image)) $image = 'addon/smileybutton/view/default.png'; - $image_url = $a->getBaseURL().'/'.$image; + $image_url = DI::baseUrl()->get().'/'.$image; //Add the hmtl and script to the page $b = <<< EOT diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 38b9f8ab..0f48b87f 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -239,7 +239,7 @@ function statusnet_settings(App $a, &$s) if (!local_user()) { return; } - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have a base api url and a consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -736,7 +736,7 @@ function statusnet_prepare_body(App $a, &$b) } $item = $b["item"]; - $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"]; + $item["plink"] = DI::baseUrl()->get() . "/display/" . $item["guid"]; $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()]; $orig_post = Item::selectFirst(['author-link', 'uri'], $condition); @@ -1529,7 +1529,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false) if ($mtch[1] == "#") { // Replacing the hash tags that are directed to the GNU Social server with internal links $snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]"; - $frdchash = '#[url=' . $a->getBaseURL() . '/search?tag=' . $mtch[3] . ']' . $mtch[3] . '[/url]'; + $frdchash = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $mtch[3] . ']' . $mtch[3] . '[/url]'; $body = str_replace($snhash, $frdchash, $body); $str_tags .= $frdchash; diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index c0e65c7e..ac9208ca 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -18,6 +18,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Util\Strings; function tumblr_install() @@ -109,7 +110,7 @@ function tumblr_connect(App $a) // The callback URL is the script that gets called after the user authenticates with tumblr // In this example, it would be the included callback.php - $callback_url = $a->getBaseURL()."/tumblr/callback"; + $callback_url = DI::baseUrl()->get()."/tumblr/callback"; // Let's begin. First we need a Request Token. The request token is required to send the user // to Tumblr's login page. @@ -188,7 +189,7 @@ function tumblr_callback(App $a) PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']); $o = L10n::t("You are now authenticated to tumblr."); - $o .= '
'.L10n::t("return to the connector page").''; + $o .= '
' . L10n::t("return to the connector page") . ''; return $o; } @@ -219,7 +220,7 @@ function tumblr_settings(App $a, &$s) /* Add our stylesheet to the page so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variables */ @@ -242,7 +243,7 @@ function tumblr_settings(App $a, &$s) $s .= ''; $s .= '
'; $s .= '
'; diff --git a/twitter/twitter.php b/twitter/twitter.php index cfa7bfdc..52a59480 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -288,7 +288,7 @@ function twitter_settings(App $a, &$s) if (!local_user()) { return; } - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* * * * 1) Check that we have global consumer key & secret * 2) If no OAuthtoken & stuff is present, generate button to get some @@ -839,7 +839,7 @@ function twitter_prepare_body(App $a, array &$b) if ($b["preview"]) { $max_char = 280; $item = $b["item"]; - $item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"]; + $item["plink"] = DI::baseUrl()->get() . "/display/" . $item["guid"]; $condition = ['uri' => $item["thr-parent"], 'uid' => local_user()]; $orig_post = Item::selectFirst(['author-link'], $condition); @@ -1146,7 +1146,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) $tags_arr = []; foreach ($item->entities->hashtags AS $hashtag) { - $url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]'; + $url = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]'; $tags_arr['#' . $hashtag->text] = $url; $body = str_replace('#' . $hashtag->text, $url, $body); } @@ -1279,7 +1279,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture) } $basetag = str_replace('_', ' ', substr($tag, 1)); - $url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; + $url = '#[url=' . DI::baseUrl()->get() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]'; $body = str_replace($tag, $url, $body); $tags_arr['#' . $basetag] = $url; } elseif (strpos($tag, '@') === 0) { diff --git a/widgets/widgets.php b/widgets/widgets.php index 5c075964..c22c3f68 100644 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -13,6 +13,7 @@ use Friendica\Core\Logger; use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Database\DBA; +use Friendica\DI; function widgets_install() { Hook::register('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings'); @@ -76,8 +77,7 @@ function widgets_module() { } function _abs_url($s){ - $a = \get_app(); - return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s); + return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1" . DI::baseUrl()->get() . "/\$2", $s); } function _randomAlphaNum($length){ diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index cbb770f6..dcbf3945 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -53,7 +53,7 @@ function xmpp_addon_settings(App $a, &$s) /* Add our stylesheet to the xmpp so we can make our settings look nice */ - $a->page['htmlhead'] .= '' . "\r\n"; + $a->page['htmlhead'] .= '' . "\r\n"; /* Get the current state of our config variable */ -- 2.39.5