From ed9dac2ac1bc9eb85290fa29d9064ae2c43d8b59 Mon Sep 17 00:00:00 2001 From: Celestora Date: Tue, 5 Apr 2022 14:39:13 +0300 Subject: [PATCH] Use correct image sizes in various templates --- Web/Models/Entities/Club.php | 4 ++-- Web/Models/Entities/Photo.php | 1 + Web/Models/Entities/User.php | 4 ++-- Web/Presenters/templates/Admin/Club.xml | 6 +++--- Web/Presenters/templates/Admin/Clubs.xml | 4 ++-- Web/Presenters/templates/Admin/User.xml | 2 +- Web/Presenters/templates/Admin/Users.xml | 2 +- Web/Presenters/templates/Admin/Voucher.xml | 2 +- Web/Presenters/templates/Group/Followers.xml | 4 ++-- Web/Presenters/templates/Group/View.xml | 4 ++-- Web/Presenters/templates/Messenger/App.xml | 4 ++-- Web/Presenters/templates/Messenger/Index.xml | 4 ++-- Web/Presenters/templates/Notes/List.xml | 2 +- Web/Presenters/templates/Notification/Feed.xml | 2 +- Web/Presenters/templates/Photos/AlbumList.xml | 2 +- Web/Presenters/templates/Photos/Photo.xml | 2 +- Web/Presenters/templates/Search/Index.xml | 2 +- Web/Presenters/templates/Support/AnswerTicket.xml | 2 +- Web/Presenters/templates/Support/View.xml | 2 +- Web/Presenters/templates/User/Friends.xml | 4 ++-- Web/Presenters/templates/User/Groups.xml | 2 +- Web/Presenters/templates/User/View.xml | 8 ++++---- Web/Presenters/templates/components/comment.xml | 2 +- .../templates/components/post/microblogpost.xml | 2 +- Web/Presenters/templates/components/post/oldpost.xml | 2 +- 25 files changed, 38 insertions(+), 37 deletions(-) diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php index 0c91b11e..382332dd 100644 --- a/Web/Models/Entities/Club.php +++ b/Web/Models/Entities/Club.php @@ -38,12 +38,12 @@ class Club extends RowModel return iterator_to_array($avPhotos)[0] ?? NULL; } - function getAvatarUrl(): string + function getAvatarUrl(string $size = "miniscule"): string { $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(); + return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURLBySizeId($size); } function getAvatarLink(): string diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php index 3de9fae0..63207b8a 100644 --- a/Web/Models/Entities/Photo.php +++ b/Web/Models/Entities/Photo.php @@ -26,6 +26,7 @@ class Photo extends Media if(($image->getWidth() / $image->getHeight()) > ($px / $py)) { # For some weird reason using resize with EXACT flag causes system to consume an unholy amount of RAM $image->crop(0, 0, "100%", (int) ceil(($px * $image->getWidth()) / $py)); + $res[0] = true; } } diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index e555b96c..e3307bf9 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -102,7 +102,7 @@ class User extends RowModel return "/id" . $this->getId(); } - function getAvatarUrl(): string + function getAvatarUrl(string $size = "miniscule"): string { $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; @@ -115,7 +115,7 @@ class User extends RowModel if(is_null($avPhoto)) return "$serverUrl/assets/packages/static/openvk/img/camera_200.png"; else - return $avPhoto->getURL(); + return $avPhoto->getURLBySizeId($size); } function getAvatarLink(): string diff --git a/Web/Presenters/templates/Admin/Club.xml b/Web/Presenters/templates/Admin/Club.xml index c79a3cf7..55f3f2ad 100644 --- a/Web/Presenters/templates/Admin/Club.xml +++ b/Web/Presenters/templates/Admin/Club.xml @@ -38,7 +38,7 @@ - + @@ -155,7 +155,7 @@ - {$follower->getCanonicalName()} + {$follower->getCanonicalName()} @@ -188,4 +188,4 @@ {/if} -{/block} \ No newline at end of file +{/block} diff --git a/Web/Presenters/templates/Admin/Clubs.xml b/Web/Presenters/templates/Admin/Clubs.xml index 4e9de1cb..33093fa5 100644 --- a/Web/Presenters/templates/Admin/Clubs.xml +++ b/Web/Presenters/templates/Admin/Clubs.xml @@ -32,7 +32,7 @@ - {$club->getCanonicalName()} + {$club->getCanonicalName()} @@ -43,7 +43,7 @@ - {$user->getCanonicalName()} + {$user->getCanonicalName()} diff --git a/Web/Presenters/templates/Admin/User.xml b/Web/Presenters/templates/Admin/User.xml index ae4e1dc1..205add63 100644 --- a/Web/Presenters/templates/Admin/User.xml +++ b/Web/Presenters/templates/Admin/User.xml @@ -17,7 +17,7 @@ - + diff --git a/Web/Presenters/templates/Admin/Users.xml b/Web/Presenters/templates/Admin/Users.xml index d0e1ece3..e50ed795 100644 --- a/Web/Presenters/templates/Admin/Users.xml +++ b/Web/Presenters/templates/Admin/Users.xml @@ -32,7 +32,7 @@ - {$user->getCanonicalName()} + {$user->getCanonicalName()} diff --git a/Web/Presenters/templates/Admin/Voucher.xml b/Web/Presenters/templates/Admin/Voucher.xml index 163f6111..1de53fe0 100644 --- a/Web/Presenters/templates/Admin/Voucher.xml +++ b/Web/Presenters/templates/Admin/Voucher.xml @@ -74,7 +74,7 @@ - {$user->getCanonicalName()} + {$user->getCanonicalName()} diff --git a/Web/Presenters/templates/Group/Followers.xml b/Web/Presenters/templates/Group/Followers.xml index f8980f7f..d451daff 100644 --- a/Web/Presenters/templates/Group/Followers.xml +++ b/Web/Presenters/templates/Group/Followers.xml @@ -41,7 +41,7 @@ {/block} {block preview} - {$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()} + {$x instanceof $Manager ? $x->getUser()->getCanonicalName() : $x->getCanonicalName()} {/block} {block name} @@ -140,4 +140,4 @@ {/if} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index a37a5a1b..6ab0c055 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -57,7 +57,7 @@
@@ -94,7 +94,7 @@ {var avatarPhoto = $club->getAvatarPhoto()} {var avatarLink = ((is_null($avatarPhoto) ? FALSE : $avatarPhoto->isAnonymous()) ? "/photo" . ("s/" . base_convert((string) $avatarPhoto->getId(), 10, 32)) : $club->getAvatarLink())} - +
{if $correspondent->getId() === $thisUser->getId() || $correspondent->getPrivacyPermission('messages.write', $thisUser)} - {$thisUser->getCanonicalName()} + {$thisUser->getCanonicalName()}
- {$correspondent->getCanonicalName()} + {$correspondent->getCanonicalName()} {else}
{/if} diff --git a/Web/Presenters/templates/Messenger/Index.xml b/Web/Presenters/templates/Messenger/Index.xml index 63461d92..f0a12371 100644 --- a/Web/Presenters/templates/Messenger/Index.xml +++ b/Web/Presenters/templates/Messenger/Index.xml @@ -25,7 +25,7 @@ {var lastMsg = $coresp->getPreviewMessage()}
- Фотография пользователя