Browse Source

Remove deprecated App::removeBaseURL - process methods to DI::baseUrl()->remove()

pull/8019/head
nupplaPhil 1 year ago
parent
commit
e93fba5136
No known key found for this signature in database GPG Key ID: D8365C3D36B77D90
10 changed files with 17 additions and 28 deletions
  1. +2
    -1
      mod/display.php
  2. +1
    -1
      mod/profiles.php
  3. +0
    -15
      src/App.php
  4. +2
    -1
      src/Content/Nav.php
  5. +1
    -1
      src/Core/System.php
  6. +1
    -1
      src/Model/Item.php
  7. +2
    -2
      src/Module/Item/Compose.php
  8. +4
    -4
      src/Object/Post.php
  9. +2
    -1
      view/theme/frio/theme.php
  10. +2
    -1
      view/theme/vier/theme.php

+ 2
- 1
mod/display.php View File

@ -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;


+ 1
- 1
mod/profiles.php View File

@ -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'],


+ 0
- 15
src/App.php View File

@ -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
*


+ 2
- 1
src/Content/Nav.php View File

@ -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'],
];
}


+ 1
- 1
src/Core/System.php View File

@ -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);
}
/**


+ 1
- 1
src/Model/Item.php View File

@ -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');
}


+ 2
- 2
src/Module/Item/Compose.php View File

@ -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'),


+ 4
- 4
src/Object/Post.php View File

@ -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'),


+ 2
- 1
view/theme/frio/theme.php View File

@ -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()));


+ 2
- 1
view/theme/vier/theme.php View File

@ -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;
}


Loading…
Cancel
Save