From e93fba51362a8cc212cb42542fd013ffd28b1164 Mon Sep 17 00:00:00 2001 From: nupplaPhil Date: Mon, 16 Dec 2019 00:36:31 +0100 Subject: [PATCH] Remove deprecated App::removeBaseURL - process methods to DI::baseUrl()->remove() --- mod/display.php | 3 ++- mod/profiles.php | 2 +- src/App.php | 15 --------------- src/Content/Nav.php | 3 ++- src/Core/System.php | 2 +- src/Model/Item.php | 2 +- src/Module/Item/Compose.php | 4 ++-- src/Object/Post.php | 8 ++++---- view/theme/frio/theme.php | 3 ++- view/theme/vier/theme.php | 3 ++- 10 files changed, 17 insertions(+), 28 deletions(-) diff --git a/mod/display.php b/mod/display.php index de46cce0cb..0d082f5982 100644 --- a/mod/display.php +++ b/mod/display.php @@ -16,6 +16,7 @@ use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Core\Session; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; @@ -326,7 +327,7 @@ function display_content(App $a, $update = false, $update_uid = 0) $title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true)); $author_name = $item["author-name"]; - $image = $a->removeBaseURL($item["author-avatar"]); + $image = DI::baseUrl()->remove($item["author-avatar"]); if ($title == "") { $title = $author_name; diff --git a/mod/profiles.php b/mod/profiles.php index e298df668c..18fe636d3d 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -655,7 +655,7 @@ function profiles_content(App $a) { $profiles = ''; foreach ($r as $rr) { $profiles .= Renderer::replaceMacros($tpl, [ - '$photo' => $a->removeBaseURL($rr['thumb']), + '$photo' => DI::baseUrl()->remove($rr['thumb']), '$id' => $rr['id'], '$alt' => L10n::t('Profile Image'), '$profile_name' => $rr['profile-name'], diff --git a/src/App.php b/src/App.php index e213b741a3..d04c6f3235 100644 --- a/src/App.php +++ b/src/App.php @@ -323,21 +323,6 @@ class App return $this->baseURL->getUrlPath(); } - /** - * @brief Removes the base url from an url. This avoids some mixed content problems. - * - * @param string $origURL - * - * @return string The cleaned url - * - * @deprecated 2019.09 - Use BaseURL->remove() instead - * @see BaseURL::remove() - */ - public function removeBaseURL(string $origURL) - { - return $this->baseURL->remove($origURL); - } - /** * Returns the current UserAgent as a String * diff --git a/src/Content/Nav.php b/src/Content/Nav.php index ff1680ab3f..6fca7beb91 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -12,6 +12,7 @@ use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Profile; use Friendica\Model\User; @@ -167,7 +168,7 @@ class Nav // user info $contact = DBA::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]); $userinfo = [ - 'icon' => (DBA::isResult($contact) ? $a->removeBaseURL($contact['micro']) : 'images/person-48.jpg'), + 'icon' => (DBA::isResult($contact) ? DI::baseUrl()->remove($contact['micro']) : 'images/person-48.jpg'), 'name' => $a->user['username'], ]; } diff --git a/src/Core/System.php b/src/Core/System.php index 367e055c93..426eb0a53d 100644 --- a/src/Core/System.php +++ b/src/Core/System.php @@ -41,7 +41,7 @@ class System */ public static function removedBaseUrl(string $orig_url) { - return DI::app()->removeBaseURL($orig_url); + return DI::baseUrl()->remove($orig_url); } /** diff --git a/src/Model/Item.php b/src/Model/Item.php index f955337179..3f3de8f8f1 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -3655,7 +3655,7 @@ class Item ]; if (!empty($item['plink'])) { - $ret["href"] = $a->removeBaseURL($item['plink']); + $ret["href"] = DI::baseUrl()->remove($item['plink']); $ret["title"] = L10n::t('link to source'); } diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index 7a26c93cf0..5d4a3c18ed 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -127,9 +127,9 @@ class Compose extends BaseModule '$type' => $type, '$wall' => $wall, '$default' => '', - '$mylink' => $a->removeBaseURL($a->contact['url']), + '$mylink' => DI::baseUrl()->remove($a->contact['url']), '$mytitle' => L10n::t('This is you'), - '$myphoto' => $a->removeBaseURL($a->contact['thumb']), + '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']), '$submit' => L10n::t('Submit'), '$edbold' => L10n::t('Bold'), '$editalic' => L10n::t('Italic'), diff --git a/src/Object/Post.php b/src/Object/Post.php index e5a66a562f..38ef122748 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -409,7 +409,7 @@ class Post 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), 'name' => $name_e, - 'thumb' => $a->removeBaseURL(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)), + 'thumb' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)), 'osparkle' => $osparkle, 'sparkle' => $sparkle, 'title' => $title_e, @@ -423,7 +423,7 @@ class Post 'shiny' => $shiny, 'owner_self' => $item['author-link'] == Session::get('my_url'), 'owner_url' => $this->getOwnerUrl(), - 'owner_photo' => $a->removeBaseURL(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)), + 'owner_photo' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)), 'owner_name' => $owner_name_e, 'plink' => Item::getPlink($item), 'edpost' => $edpost, @@ -899,9 +899,9 @@ class Post '$qcomment' => $qcomment, '$default' => $default_text, '$profile_uid' => $uid, - '$mylink' => $a->removeBaseURL($a->contact['url']), + '$mylink' => DI::baseUrl()->remove($a->contact['url']), '$mytitle' => L10n::t('This is you'), - '$myphoto' => $a->removeBaseURL($a->contact['thumb']), + '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']), '$comment' => L10n::t('Comment'), '$submit' => L10n::t('Submit'), '$edbold' => L10n::t('Bold'), diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php index 5995f54374..1e255e38b0 100644 --- a/view/theme/frio/theme.php +++ b/view/theme/frio/theme.php @@ -17,6 +17,7 @@ use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Session; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model; use Friendica\Module; use Friendica\Util\Strings; @@ -239,7 +240,7 @@ function frio_remote_nav($a, &$nav) // user info $r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid'])); - $r[0]['photo'] = (DBA::isResult($r) ? $a->removeBaseURL($r[0]['micro']) : 'images/person-48.jpg'); + $r[0]['photo'] = (DBA::isResult($r) ? DI::baseUrl()->remove($r[0]['micro']) : 'images/person-48.jpg'); $r[0]['name'] = $a->user['username']; } elseif (!local_user() && remote_user()) { $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index e5d71bdf57..2ffa957fe0 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -18,6 +18,7 @@ use Friendica\Core\PConfig; use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\DI; use Friendica\Model\Contact; use Friendica\Model\GContact; use Friendica\Util\Proxy as ProxyUtils; @@ -163,7 +164,7 @@ function vier_community_info() $entry = Renderer::replaceMacros($tpl, [ '$id' => $rr['id'], '$profile_link' => $profile_link, - '$photo' => $a->removeBaseURL($rr['thumb']), + '$photo' => DI::baseUrl()->remove($rr['thumb']), '$alt_text' => $rr['name']]); $aside['$lastusers_items'][] = $entry; } -- 2.39.5