Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-12-22 16:42:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix avatar erros

Browse source
This commit is contained in:
Celestina Rempai 2021-02-06 20:38:39 +00:00 committed by Alma Armas
parent 19000c2f03
commit 574f4918e5
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,10 +40,8 @@ class Club extends RowModel
function getAvatarUrl(): string function getAvatarUrl(): string
{ {
$url = ((!empty($_SERVER['HTTPS'])) ? 'https' : 'http') . '://' . $_SERVER['SERVER_NAME'] . '/'; $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"];
$url = explode('?', $url); $avPhoto = $this->getAvatarPhoto();
$serverUrl = $url[0];
$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();
} }

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

@ -103,9 +103,7 @@ class User extends RowModel
function getAvatarUrl(): string function getAvatarUrl(): string
{ {
$url = ((!empty($_SERVER['HTTPS'])) ? 'https' : 'http') . '://' . $_SERVER['SERVER_NAME']; $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"];
$url = explode('?', $url);
$serverUrl = $url[0];
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";
@ -370,20 +368,16 @@ class User extends RowModel
if(!$this->getRecord()->status) { if(!$this->getRecord()->status) {
$unfilled[] = "status"; $unfilled[] = "status";
$incompleteness += 10; $incompleteness += 15;
} }
if(!$this->getRecord()->telegram) { if(!$this->getRecord()->telegram) {
$unfilled[] = "telegram"; $unfilled[] = "telegram";
$incompleteness += 10; $incompleteness += 15;
} }
if(!$this->getRecord()->email) { if(!$this->getRecord()->email) {
$unfilled[] = "email"; $unfilled[] = "email";
$incompleteness += 20; $incompleteness += 20;
} }
if(!$this->getRecord()->phone) {
$unfilled[] = "phone";
$incompleteness += 20;
}
if(!$this->getRecord()->city) { if(!$this->getRecord()->city) {
$unfilled[] = "city"; $unfilled[] = "city";
$incompleteness += 20; $incompleteness += 20;

8
bootstrap.php
View file

@ -156,9 +156,13 @@ function ovk_is_ssl(): bool
return $GLOBALS["requestIsSSL"]; return $GLOBALS["requestIsSSL"];
} }
function ovk_scheme(): string function ovk_scheme(bool $with_slashes = false): string
{ {
return ovk_is_ssl() ? "https" : "http"; $scheme = ovk_is_ssl() ? "https" : "http";
if($with_slashes)
$scheme .= "://";
return $scheme;
} }
return (function() { return (function() {