From e5afb0fc88ad20a229f24812f5e893906dceaab8 Mon Sep 17 00:00:00 2001
From: Ilya Prokopenko <dsrev@protonmail.com>
Date: Sun, 6 Feb 2022 16:09:26 +0300
Subject: [PATCH] Users, Groups: Fix URL avatar output

This commit fixes the avatar URL output for those who visit the website with a port (e.g. ovk.domain.tld:1337)
---
 Web/Models/Entities/Club.php | 12 +-----------
 Web/Models/Entities/User.php |  2 +-
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php
index 2230b1a0..0c91b11e 100644
--- a/Web/Models/Entities/Club.php
+++ b/Web/Models/Entities/Club.php
@@ -40,7 +40,7 @@ class Club extends RowModel
     
     function getAvatarUrl(): string
     {
-        $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"];
+        $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
         $avPhoto   = $this->getAvatarPhoto();
         
         return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL();
@@ -64,16 +64,6 @@ class Club extends RowModel
         else
             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
     {
diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php
index 37fbe3bc..36077375 100644
--- a/Web/Models/Entities/User.php
+++ b/Web/Models/Entities/User.php
@@ -104,7 +104,7 @@ class User extends RowModel
     
     function getAvatarUrl(): string
     {
-        $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"];
+        $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"];
         
         if($this->getRecord()->deleted)
             return "$serverUrl/assets/packages/static/openvk/img/camera_200.png";