clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
nupplaPhil 2019-12-16 00:36:31 +01:00
parent 5609e94b05
commit e93fba5136
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
10 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mod/display.php
View File

@ -16,6 +16,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; 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)); $title = trim(HTML::toPlaintext(BBCode::convert($item["title"], false), 0, true));
$author_name = $item["author-name"]; $author_name = $item["author-name"];
$image = $a->removeBaseURL($item["author-avatar"]); $image = DI::baseUrl()->remove($item["author-avatar"]);
if ($title == "") { if ($title == "") {
$title = $author_name; $title = $author_name;

2
mod/profiles.php
View File

@ -655,7 +655,7 @@ function profiles_content(App $a) {
$profiles = ''; $profiles = '';
foreach ($r as $rr) { foreach ($r as $rr) {
$profiles .= Renderer::replaceMacros($tpl, [ $profiles .= Renderer::replaceMacros($tpl, [
'$photo' => $a->removeBaseURL($rr['thumb']), '$photo' => DI::baseUrl()->remove($rr['thumb']),
'$id' => $rr['id'], '$id' => $rr['id'],
'$alt' => L10n::t('Profile Image'), '$alt' => L10n::t('Profile Image'),
'$profile_name' => $rr['profile-name'], '$profile_name' => $rr['profile-name'],

15
src/App.php
View File

@ -323,21 +323,6 @@ class App
return $this->baseURL->getUrlPath(); 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 * Returns the current UserAgent as a String
* *

3
src/Content/Nav.php
View File

@ -12,6 +12,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
@ -167,7 +168,7 @@ class Nav
// user info // user info
$contact = DBA::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]); $contact = DBA::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]);
$userinfo = [ $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'], 'name' => $a->user['username'],
]; ];
} }

2
src/Core/System.php
View File

@ -41,7 +41,7 @@ class System
*/ */
public static function removedBaseUrl(string $orig_url) public static function removedBaseUrl(string $orig_url)
{ {
return DI::app()->removeBaseURL($orig_url); return DI::baseUrl()->remove($orig_url);
} }
/** /**

2
src/Model/Item.php
View File

@ -3655,7 +3655,7 @@ class Item
]; ];
if (!empty($item['plink'])) { if (!empty($item['plink'])) {
$ret["href"] = $a->removeBaseURL($item['plink']); $ret["href"] = DI::baseUrl()->remove($item['plink']);
$ret["title"] = L10n::t('link to source'); $ret["title"] = L10n::t('link to source');
} }

4
src/Module/Item/Compose.php
View File

@ -127,9 +127,9 @@ class Compose extends BaseModule
'$type' => $type, '$type' => $type,
'$wall' => $wall, '$wall' => $wall,
'$default' => '', '$default' => '',
'$mylink' => $a->removeBaseURL($a->contact['url']), '$mylink' => DI::baseUrl()->remove($a->contact['url']),
'$mytitle' => L10n::t('This is you'), '$mytitle' => L10n::t('This is you'),
'$myphoto' => $a->removeBaseURL($a->contact['thumb']), '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']),
'$submit' => L10n::t('Submit'), '$submit' => L10n::t('Submit'),
'$edbold' => L10n::t('Bold'), '$edbold' => L10n::t('Bold'),
'$editalic' => L10n::t('Italic'), '$editalic' => L10n::t('Italic'),

8
src/Object/Post.php
View File

@ -409,7 +409,7 @@ class Post
'profile_url' => $profile_link, 'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item), 'item_photo_menu' => item_photo_menu($item),
'name' => $name_e, '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, 'osparkle' => $osparkle,
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'title' => $title_e, 'title' => $title_e,
@ -423,7 +423,7 @@ class Post
'shiny' => $shiny, 'shiny' => $shiny,
'owner_self' => $item['author-link'] == Session::get('my_url'), 'owner_self' => $item['author-link'] == Session::get('my_url'),
'owner_url' => $this->getOwnerUrl(), '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, 'owner_name' => $owner_name_e,
'plink' => Item::getPlink($item), 'plink' => Item::getPlink($item),
'edpost' => $edpost, 'edpost' => $edpost,
@ -899,9 +899,9 @@ class Post
'$qcomment' => $qcomment, '$qcomment' => $qcomment,
'$default' => $default_text, '$default' => $default_text,
'$profile_uid' => $uid, '$profile_uid' => $uid,
'$mylink' => $a->removeBaseURL($a->contact['url']), '$mylink' => DI::baseUrl()->remove($a->contact['url']),
'$mytitle' => L10n::t('This is you'), '$mytitle' => L10n::t('This is you'),
'$myphoto' => $a->removeBaseURL($a->contact['thumb']), '$myphoto' => DI::baseUrl()->remove($a->contact['thumb']),
'$comment' => L10n::t('Comment'), '$comment' => L10n::t('Comment'),
'$submit' => L10n::t('Submit'), '$submit' => L10n::t('Submit'),
'$edbold' => L10n::t('Bold'), '$edbold' => L10n::t('Bold'),

3
view/theme/frio/theme.php
View File

@ -17,6 +17,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model; use Friendica\Model;
use Friendica\Module; use Friendica\Module;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -239,7 +240,7 @@ function frio_remote_nav($a, &$nav)
// user info // user info
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid'])); $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']; $r[0]['name'] = $a->user['username'];
} elseif (!local_user() && remote_user()) { } elseif (!local_user() && remote_user()) {
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user())); $r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));

3
view/theme/vier/theme.php
View File

@ -18,6 +18,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
@ -163,7 +164,7 @@ function vier_community_info()
$entry = Renderer::replaceMacros($tpl, [ $entry = Renderer::replaceMacros($tpl, [
'$id' => $rr['id'], '$id' => $rr['id'],
'$profile_link' => $profile_link, '$profile_link' => $profile_link,
'$photo' => $a->removeBaseURL($rr['thumb']), '$photo' => DI::baseUrl()->remove($rr['thumb']),
'$alt_text' => $rr['name']]); '$alt_text' => $rr['name']]);
$aside['$lastusers_items'][] = $entry; $aside['$lastusers_items'][] = $entry;
} }