Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-11-13 10:39:24 +03:00
Code Issues Projects Releases Packages Wiki Activity

Users, Groups: Fix URL avatar output

Browse source 
This commit fixes the avatar URL output for those who visit the website with a port (e.g. ovk.domain.tld:1337)
This commit is contained in:
Ilya Prokopenko 2022-02-06 16:09:26 +03:00
parent 20196cc259
commit e5afb0fc88
No known key found for this signature in database
GPG key ID: 7736BBBB05F14A56
2 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Web/Models/Entities/Club.php
View file

@ -40,7 +40,7 @@ class Club extends RowModel
function getAvatarUrl(): string function getAvatarUrl(): string
{ {
$serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
$avPhoto = $this->getAvatarPhoto(); $avPhoto = $this->getAvatarPhoto();
return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL(); return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL();
@ -64,16 +64,6 @@ class Club extends RowModel
else else
return "/club" . $this->getId(); return "/club" . $this->getId();
} }
/*
function getAvatarUrl(): string
{
$avAlbum = (new Albums)->getUserAvatarAlbum($this);
$avCount = $avAlbum->getPhotosCount();
$avPhotos = $avAlbum->getPhotos($avCount, 1);
$avPhoto = iterator_to_array($avPhotos)[0] ?? NULL;
return is_null($avPhoto) ? "/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL();
} */
function getName(): string function getName(): string
{ {

2
Web/Models/Entities/User.php
View file

@ -104,7 +104,7 @@ class User extends RowModel
function getAvatarUrl(): string function getAvatarUrl(): string
{ {
$serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
if($this->getRecord()->deleted) if($this->getRecord()->deleted)
return "$serverUrl/assets/packages/static/openvk/img/camera_200.png"; return "$serverUrl/assets/packages/static/openvk/img/camera_200.png";