From 11491f24cb6671fcc4962211e552815f460cb49d Mon Sep 17 00:00:00 2001 From: themohooks Date: Fri, 11 Feb 2022 18:12:44 +0300 Subject: [PATCH 01/54] Update SU strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit да --- locales/su.strings | 123 +++++++++++++++++++++++++++++++++------------ 1 file changed, 92 insertions(+), 31 deletions(-) diff --git a/locales/su.strings b/locales/su.strings index e6d995d9..44e77443 100644 --- a/locales/su.strings +++ b/locales/su.strings @@ -53,7 +53,7 @@ "registration_date" = "Дата регистрации"; "hometown" = "Родной город"; "this_is_you" = "это Вы"; -"edit_page" = "Изменить информацию паспорта"; +"edit_page" = "Изменить информацию досье"; "edit_group" = "Изменить информацию клуба"; "change_status" = "изменить "; "name" = "Имя"; @@ -164,7 +164,7 @@ "no_comments" = "Отзывы отсутствуют"; "all_news" = "Все новостные газеты"; -"posts_per_page" = "Количество записей в паспорте"; +"posts_per_page" = "Количество записей в досье"; "attachment" = "Вложение"; "post_as_group" = "От имени клуба"; @@ -255,6 +255,7 @@ "hidden_yes" = "Скрыт: Да"; "hidden_no" = "Скрыт: Нет"; "group_allow_post_for_everyone" = "Разрешить публиковать записи всем"; +group_hide_from_global_feed" = "Не отображать записи в публичной доске"; "statistics" = "Статистика"; "group_administrators_list" = "Список админов"; "group_display_only_creator" = "Отображать только создателя группы"; @@ -296,7 +297,7 @@ "open_original" = "Посмотреть оригинал картинки"; -"avatar_album" = "Картинки с паспорта"; +"avatar_album" = "Картинки из досье"; "wall_album" = "Картинки с доски"; "albums_zero" = "Ни одного альбома с картинками"; @@ -322,22 +323,22 @@ /* Menus */ -"edit_button" = "ред."; -"my_page" = "Мой Паспорт"; +"edit_button" = "корр."; +"my_page" = "Мое Досье"; "my_friends" = "Мои Товарищи"; "my_photos" = "Мои Фотокартинки"; "my_videos" = "Мои Киноленты"; -"my_messages" = "Мои Письма"; -"my_notes" = "Мои Черновики"; +"my_messages" = "Мои Телеграмы"; +"my_notes" = "Мои Записки"; "my_groups" = "Мои Клубы"; -"my_feed" = "Мои Газеты"; -"my_feedback" = "Мои Ответы"; +"my_feed" = "Мое Информбюро"; +"my_feedback" = "Мои Сводки"; "my_settings" = "Мои Настройки"; "bug_tracker" = "Доска задач"; "menu_login" = "Вход"; "menu_registration" = "Регистрация"; -"menu_help" = "Помощь"; +"menu_help" = "Справка"; "menu_logout" = "Выйти"; "menu_support" = "Поддержка"; @@ -346,9 +347,9 @@ "header_groups" = "клубы"; "header_people" = "граждане"; "header_invite" = "пригласить"; -"header_help" = "помощь"; -"header_log_out" = "выйти"; -"header_search" = "Поиск"; +"header_help" = "справка"; +"header_log_out" = "эмиграция"; +"header_search" = "Розыск"; "header_login" = "вход"; "header_registration" = "регистрация"; @@ -359,14 +360,14 @@ "footer_help" = "помощь"; "footer_developers" = "госслужащим"; "footer_choose_language" = "выбрать язык"; -"footer_privacy" = "приватность"; +"footer_privacy" = "секретность"; /* Settings */ "main" = "Основное"; "contacts" = "Контакты"; -"avatar" = Картинка"; -"privacy" = "Приватность"; +"avatar" = "Картинка"; +"privacy" = "Секретность"; "interface" = "Внешний вид"; "profile_picture" = "Изображение страницы"; @@ -385,8 +386,8 @@ "cut" = "Обрезка"; "round_avatars" = "Круглая картинка"; -"search_for_groups" = "Поиск клубов"; -"search_for_people" = "Поиск гражданинов"; +"search_for_groups" = "Розыск клубов"; +"search_for_people" = "Розыск граждан"; "search_button" = "Найти"; "search_placeholder" = "Начните вводить любое имя, название или слово"; "results_zero" = "Ни одного результата"; @@ -395,7 +396,7 @@ "results_many" = "$1 результатов"; "results_other" = "$1 результатов"; -"privacy_setting_access_page" = "Кому из граждан виден мой паспорт"; +"privacy_setting_access_page" = "Кому из граждан видно мое досье"; "privacy_setting_read_info" = "Кому видно основную информацию моей страницы"; "privacy_setting_see_groups" = "Кому разрешено просматривать мои картинки и встречи"; "privacy_setting_see_photos" = "Кому разрешено просматривать мои картинки"; @@ -410,17 +411,17 @@ "privacy_value_users" = "Участникам органа OpenVK"; "privacy_value_friends" = "Товарищи"; "privacy_value_friends_dative" = "Товарищам"; -"privacy_value_only_me" = "Только я"; -"privacy_value_only_me_dative" = "Только мне"; +"privacy_value_only_me" = "Только я и КГБ"; +"privacy_value_only_me_dative" = "Только мне и КГБ"; "privacy_value_nobody" = "Никто"; "your_email_address" = "Адрес Вашего почтового ящика"; -"your_page_address" = "Адрес Вашего паспорта"; -"page_address" = "Адрес паспорта"; +"your_page_address" = "Адрес Вашего досье"; +"page_address" = "Адрес досье"; "current_email_address" = "Текущий адрес"; -"page_id" = "Номер паспорта"; +"page_id" = "Номер досье"; "you_can_also" = "Вы также можете"; -"delete_your_page" = "порвать свой паспорт"; +"delete_your_page" = "порвать свое досье"; "delete_album" = "выкинуть свой альбом с картинками"; "ui_settings_interface" = "Интерфейс"; @@ -430,7 +431,7 @@ "ui_settings_rating_hide" = "Скрывать"; "additional_links" = "Дополнительные ссылки"; - +"ad_poster" = "Рекламный плакат"; /* Two-factor authentication */ "two_factor_authentication" = "Двухфакторная аутентификация"; @@ -561,7 +562,7 @@ "transferred_to_you" = "передал вам"; -"receiver_address" = "Адрес паспорта получателя"; +"receiver_address" = "Адрес досье получателя"; "coins_count" = "Количество рублей"; "message" = "Сообщение"; @@ -609,6 +610,21 @@ /* Support */ +"increase_rating" = "Увеличить рейтинг"; +"increase_rating_button" = "Увеличить"; +"to_whom" = "Кому"; +"increase_by" = "Увеличить на"; +"price" = "Ценник"; + +"you_have_unused_votes" = "У Вас $1 неиспользованных рубля на кошельке."; +"apply_voucher" = "Применить купон"; + +"failed_to_increase_rating" = "Не удалось увеличить рейтинг"; +"rating_increase_successful" = "Вы успешно увеличили рейтинг $2 на $3%."; +"negative_rating_value" = "Орган не может украсть баллы рейтинга у другого гражданина, так не положено."; + +"increased_your_rating_by" = "увеличил ваш рейтинг на"; + "support_opened" = "Открытые"; "support_answered" = "С ответом"; "support_closed" = "Закрытые"; @@ -740,10 +756,10 @@ "forbidden_comment" = "Настройки приватности этого пользователя не разрешают вам смотреть на его страницу."; "changes_saved" = "Изменения сохранены"; -"changes_saved_comment" = "Товарищ, обоновлённые данные появятся на вашем паспорте."; +"changes_saved_comment" = "Товарищ, обоновлённые данные появятся на вашем досье."; "photo_saved" = "Картинка сохранена"; -"photo_saved_comment" = "Товарищ, орган одобрил новую картинку в вашем паспорте."; +"photo_saved_comment" = "Товарищ, орган одобрил новую картинку в вашем досье."; "shared_succ" = "Запись появится на вашей доске. Нажмите на уведомление, чтобы перейти к своей стене."; @@ -759,8 +775,8 @@ "token_manipulation_error" = "Ошибка манипулирования токеном"; "token_manipulation_error_comment" = "Токен недействителен или истёк"; -"profile_changed" = "Паспорт изменён"; -"profile_changed_comment" = Товарищ, орган одобрил изменение вашего паспорта."; +"profile_changed" = "Досье изменёно"; +"profile_changed_comment" = "Товарищ, орган одобрил изменение вашего досье."; "profile_not_found" = "Гражданин не найден."; "suspicious_registration_attempt" = "Подозрительная попытка регистрации в орган"; @@ -795,6 +811,36 @@ /* About */ "about_openvk" = "Об органе OpenVK"; +"footer_about_instance" = "о стране"; +"about_this_instance" = "Об этой стране"; +"rules" = "Правила"; +"most_popular_groups" = "Самые популярные клубы"; +"on_this_instance_are" = "На этой стране"; + +"about_users_one" = "1 гражданин"; +"about_users_few" = "$1 гражданина"; +"about_users_many" = "$1 гражданинов"; +"about_users_other" = "$1 гражданинов"; + +"about_online_users_one" = "1 пользователь в сети"; +"about_online_users_few" = "$1 пользователя в сети"; +"about_online_users_many" = "$1 гражданинов в сети"; +"about_online_users_other" = "$1 гражданинов в сети"; + +"about_active_users_one" = "1 активный пользователь"; +"about_active_users_few" = "$1 активных пользователя"; +"about_active_users_many" = "$1 активных гражданинов"; +"about_active_users_other" = "$1 активных гражданинов"; + +"about_groups_one" = "1 клуб"; +"about_groups_few" = "$1 клубы"; +"about_groups_many" = "$1 клубов"; +"about_groups_other" = "$1 клубов"; + +"about_wall_posts_one" = "1 заметка на досках"; +"about_wall_posts_few" = "$1 заметки на досках"; +"about_wall_posts_many" = "$1 заметки на досках"; +"about_wall_posts_other" = "$1 заметки на досках"; /* Dialogs */ @@ -810,5 +856,20 @@ "question_confirm" = "Товарищ, будьте внимательны с выбором. Вы согласны с вашим выбором? Отменить не представляется возможным."; /* User alerts */ +"apply_style_for_this_device" = "Применить стиль только для этой ЭВМ"; "user_alert_scam" = "Органу управления было дозволено, что данный гражданин обманывает товарищей на денежные средства. Будьте осторожны при разговоре с ним."; + + +"ec_header" = "Подтверждение регистрации прописки"; +"ec_title" = "Спасибо!"; +"ec_1" = "$1, на ваш почтовый ящик должно придти письмо с подтверждением регистрации."; +"ec_2" = "Если по каким-то причинам вам не пришло письмо, то проверьте мусорный бак. Если письма не окажется и там, то вы можете переотправить письмо."; +"ec_resend" = "Переотправить письмо"; + +"email_sent" = "Письмо было успешно отправлено."; +"email_sent_desc" = "Если ваш почтовый ящик существует, вы получите письмо."; +"email_error" = "Непредвиденная ошибка при отправке письма."; +"email_rate_limit_error" = "Нельзя делать это так часто, извините."; + +"email_verify_success" = "Ваша регистрация была подтверждена. Приятного времяпрепровождения!"; \ No newline at end of file From edccb34c5325af7c2aa2c40b292f872a77da8fed Mon Sep 17 00:00:00 2001 From: Celestora Date: Sun, 20 Mar 2022 21:54:09 +0200 Subject: [PATCH 02/54] Add phpStorm config --- .idea/.gitignore | 8 + .idea/intellij-latte/xmlSources/Latte.dtd | 46 +++ .idea/intellij-latte/xmlSources/Latte.xml | 290 ++++++++++++++++++ .../xmlSources/NetteApplication.xml | 59 ++++ .../intellij-latte/xmlSources/NetteForms.xml | 41 +++ .idea/misc.xml | 6 + .idea/modules.xml | 8 + .idea/openvk.iml | 35 +++ .idea/php.xml | 37 +++ .idea/runConfigurations.xml | 10 + .idea/vcs.xml | 6 + 11 files changed, 546 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/intellij-latte/xmlSources/Latte.dtd create mode 100644 .idea/intellij-latte/xmlSources/Latte.xml create mode 100644 .idea/intellij-latte/xmlSources/NetteApplication.xml create mode 100644 .idea/intellij-latte/xmlSources/NetteForms.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/openvk.iml create mode 100644 .idea/php.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/intellij-latte/xmlSources/Latte.dtd b/.idea/intellij-latte/xmlSources/Latte.dtd new file mode 100644 index 00000000..0cf3a95a --- /dev/null +++ b/.idea/intellij-latte/xmlSources/Latte.dtd @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/intellij-latte/xmlSources/Latte.xml b/.idea/intellij-latte/xmlSources/Latte.xml new file mode 100644 index 00000000..0bfceaf8 --- /dev/null +++ b/.idea/intellij-latte/xmlSources/Latte.xml @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/intellij-latte/xmlSources/NetteApplication.xml b/.idea/intellij-latte/xmlSources/NetteApplication.xml new file mode 100644 index 00000000..aa4a4685 --- /dev/null +++ b/.idea/intellij-latte/xmlSources/NetteApplication.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/intellij-latte/xmlSources/NetteForms.xml b/.idea/intellij-latte/xmlSources/NetteForms.xml new file mode 100644 index 00000000..036e07f6 --- /dev/null +++ b/.idea/intellij-latte/xmlSources/NetteForms.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..639900d1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..de1f1bbf --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/openvk.iml b/.idea/openvk.iml new file mode 100644 index 00000000..b5f07aa6 --- /dev/null +++ b/.idea/openvk.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 00000000..22c50b95 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..797acea5 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From b11c942c65f3fed37b4f382eae1493dac016c5ec Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Thu, 24 Mar 2022 15:29:00 +0300 Subject: [PATCH 03/54] Global: Correct the components code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit НЛО прилетело и опубликовало эту надпись здесь --- .../templates/components/attachment.xml | 8 +- .../templates/components/comment.xml | 12 +-- .../templates/components/comments.xml | 4 +- .../templates/components/paginator.xml | 12 +-- Web/Presenters/templates/components/post.xml | 5 - .../components/post/microblogpost.xml | 91 +++++++----------- .../templates/components/post/oldpost.xml | 94 +++++++------------ .../templates/components/textArea.xml | 12 +-- Web/Presenters/templates/components/wall.xml | 6 +- 9 files changed, 88 insertions(+), 156 deletions(-) diff --git a/Web/Presenters/templates/components/attachment.xml b/Web/Presenters/templates/components/attachment.xml index 9e9271f2..4689723e 100644 --- a/Web/Presenters/templates/components/attachment.xml +++ b/Web/Presenters/templates/components/attachment.xml @@ -5,8 +5,8 @@ {$attachment->getDescription()} {else} - - {_ + + {_attach_no_longer_available} {/if} {elseif $attachment instanceof \openvk\Web\Models\Entities\Video} @@ -14,12 +14,12 @@ {elseif $attachment instanceof \openvk\Web\Models\Entities\Post} {php $GLOBALS["_nesAttGloCou"] = (isset($GLOBALS["_nesAttGloCou"]) ? $GLOBALS["_nesAttGloCou"] : 0) + 1} {if $GLOBALS["_nesAttGloCou"] > 2} - {_"open_post"} + {_open_post} {else} {include "post.xml", post => $attachment, compact => true} {/if} {else} - {_"version_incompatibility"} + {_version_incompatibility} {/if} {php $GLOBALS["_nesAttGloCou"] = NULL} diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml index 5671ac54..65072458 100644 --- a/Web/Presenters/templates/components/comment.xml +++ b/Web/Presenters/templates/components/comment.xml @@ -8,10 +8,7 @@ - + @@ -19,7 +16,7 @@ {$author->getCanonicalName()} - {if $author->isVerified()}{/if}
+
@@ -34,9 +31,9 @@
{$comment->getPublicationTime()} | {if $comment->canBeDeletedBy($thisUser)} - {_"delete"} | + {_delete} | {/if} - {_"reply"} + {_reply}
- diff --git a/Web/Presenters/templates/components/comments.xml b/Web/Presenters/templates/components/comments.xml index 99400706..30009c59 100644 --- a/Web/Presenters/templates/components/comments.xml +++ b/Web/Presenters/templates/components/comments.xml @@ -1,4 +1,4 @@ -

{_"comments"} ({$count})

+

{_comments} ({$count})

{var commentsURL = "/al_comments/create/$model/" . $parent->getId()} @@ -27,7 +27,7 @@ {else}

Будьте первым кто оставит комментарий к этой дичи!

{/if} --> - {_"comments_tip"} + {_comments_tip} {/if} {script "js/al_comments.js"} diff --git a/Web/Presenters/templates/components/paginator.xml b/Web/Presenters/templates/components/paginator.xml index 7c14e7e4..206c7fb3 100644 --- a/Web/Presenters/templates/components/paginator.xml +++ b/Web/Presenters/templates/components/paginator.xml @@ -3,16 +3,10 @@
- {if $conf->page > $space} - « - {/if} + « {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++} - {if $j > 0 && $j <= $pageCount} - {$j} - {/if} + {$j} {/for} - {if $conf->page <= $pageCount-$space} - » - {/if} + »
diff --git a/Web/Presenters/templates/components/post.xml b/Web/Presenters/templates/components/post.xml index 5c1bebe0..96ec60b1 100644 --- a/Web/Presenters/templates/components/post.xml +++ b/Web/Presenters/templates/components/post.xml @@ -1,9 +1,4 @@ {var microblogEnabled = isset($thisUser) ? $thisUser->hasMicroblogEnabled() : false} -{if !$post->isPostedOnBehalfOfGroup()} - {var then = date_create("@" . $post->getOwner()->getOnline()->timestamp())} - {var now = date_create()} - {var diff = date_diff($now, $then)} -{/if} {if $microblogEnabled} {include "post/microblogpost.xml", post => $post, diff => $diff, commentSection => $commentSection} diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index d50d9b02..5755e865 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -9,25 +9,14 @@ - - {if !$post->isPostedOnBehalfOfGroup() && !$compact} - - {_online} - - {/if} + + {_online}
- - - {$author->getCanonicalName()} - - - {if $author->isVerified()}{/if} + {$author->getCanonicalName()} + {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()} {var wallId = $post->getTargetWall()} {var wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)} @@ -44,18 +33,17 @@ {/if} - {ifset $compact}
- - {$post->getPublicationTime()} - + {ifset $compact} +
+ + {$post->getPublicationTime()} + {/ifset} - {if $post->isPinned()} - {_pinned} - {/if} - {if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false) && !isset($compact)} - - {/if} + + {_pinned} + + {if $post->canBePinnedBy($thisUser) && !($forceNoPinLink ?? false) && !isset($compact)} {if $post->isPinned()} @@ -80,11 +68,11 @@  ! Этот пост был размещён за взятку.
- {var acutalAuthor = $post->getOwner(false)} + {var actualAuthor = $post->getOwner(false)} - Автор: - - {$acutalAuthor->getCanonicalName()} + {_author}: + + {$actualAuthor->getCanonicalName()}
@@ -94,26 +82,17 @@ {if isset($thisUser)}   - {if !($forceNoCommentsLink ?? false)} - - {_"comment"} - - {/if} + {_comment} {/if}
- {if !($forceNoCommentsLink ?? false)} -
- {if $commentsCount > 3} - {_view_other_comments} - {/if} - {foreach $comments as $comment} - {include "../comment.xml", comment => $comment, $compact => true} - {/foreach} -
- {var commentsURL = "/al_comments/create/posts/" . $post->getId()} - {var club = is_null($club) ? ($post->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($post->getTargetWall())) : NULL) : $club} - {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club} -
+
+ {_view_other_comments} + {foreach $comments as $comment} + {include "../comment.xml", comment => $comment, $compact => true} + {/foreach} +
+ {var commentsURL = "/al_comments/create/posts/" . $post->getId()} + {var club = is_null($club) ? ($post->getTargetWall() < 0 ? (new openvk\Web\Models\Repositories\Clubs)->get(abs($post->getTargetWall())) : NULL) : $club} + {include "../textArea.xml", route => $commentsURL, postOpts => false, graffiti => (bool) ovkGetQuirk("comments.allow-graffiti"), post => $post, club => $club}
- {/if} +
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml index 6c2958e7..1a3c4c84 100644 --- a/Web/Presenters/templates/components/post/oldpost.xml +++ b/Web/Presenters/templates/components/post/oldpost.xml @@ -5,26 +5,15 @@ - + + {_online} - {if !$post->isPostedOnBehalfOfGroup() && !($compact ?? false)} - - {_online} - - {/if} -
- - - {$author->getCanonicalName()} - - - {if $author->isVerified()}{/if} - {$post->isPostedOnBehalfOfGroup() ? "опубликовали" : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))} + {$author->getCanonicalName()} + + {$post->isPostedOnBehalfOfGroup() ? tr("post_writes_g") : ($author->isFemale() ? tr("post_writes_f") : tr("post_writes_m"))} {if ($onWallOf ?? false) &&!$post->isPostedOnBehalfOfGroup() && $post->getOwnerPost() !== $post->getTargetWall()} {var wallId = $post->getTargetWall()} {var wallURL = $wallId > -1 ? "/id$wallId" : "/club" . abs($wallId)} @@ -43,10 +32,7 @@ {/if}
- {$post->getPublicationTime()} - {if $post->isPinned()} - , {_pinned} - {/if} + {$post->getPublicationTime()}{if $post->isPinned()}, {_pinned}{/if}
@@ -64,68 +50,54 @@  ! Этот пост был размещён за взятку.
- {var acutalAuthor = $post->getOwner(false)} + {var actualAuthor = $post->getOwner(false)} - Автор: - - {$acutalAuthor->getCanonicalName()} + {_author}: + + {$actualAuthor->getCanonicalName()}
{if $post->canBeDeletedBy($thisUser) && !($forceNoDeleteLink ?? false)} - {_"delete"} |  + {_delete}  |  {/if} {if $post->canBePinnedBy($thisUser) && !($forceNoPinLink ?? false)} {if $post->isPinned()} - {_unpin} |  + {_unpin} {else} - {_pin} |  + {_pin} {/if} +  |  {/if} - {if !($forceNoCommentsLink ?? false)} - - {if $post->getCommentsCount() > 0} - {_"comments"} ({$post->getCommentsCount()}) - {else} - {_"comments"} - {/if} - - {/if} + + {_comments} + {if $post->getCommentsCount() > 0} + ({$post->getCommentsCount()}) + {/if} + {if !($forceNoCommentsLink ?? false) && !($forceNoShareLink ?? false)}  |  {/if} - {if !($forceNoShareLink ?? false)} - - {if $post->getRepostCount() > 0} - {_"share"} - ({$post->getRepostCount()}) - {else} - {_"share"} - {/if} - - {/if} + + {_share} + {if $post->getRepostCount() > 0} + ({$post->getRepostCount()}) + {/if} + - {if !($forceNoLike ?? false)} - - {/if} -
-
- +
diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml index c27d0506..c14b652a 100644 --- a/Web/Presenters/templates/components/textArea.xml +++ b/Web/Presenters/templates/components/textArea.xml @@ -27,25 +27,25 @@ {/if} {/if}
@@ -53,7 +53,7 @@
- +
{_attach} diff --git a/Web/Presenters/templates/components/wall.xml b/Web/Presenters/templates/components/wall.xml index f8be0067..feb688bc 100644 --- a/Web/Presenters/templates/components/wall.xml +++ b/Web/Presenters/templates/components/wall.xml @@ -1,9 +1,9 @@
- {_"wall"} + {_wall} - {tr("wall", $count)} - {_all_title} + {tr("wall", $count)} + {_all_title}
From 13dab88c9eb447e288f5273af844d091fd556a7f Mon Sep 17 00:00:00 2001 From: Celestora Date: Thu, 24 Mar 2022 17:03:43 +0200 Subject: [PATCH 04/54] Auto-resize coins count Coins count will still break lines if the value can be fit in multiple lines (for accessibility), but it won't escape it's box and damage page design. --- Web/Presenters/templates/User/Settings.xml | 20 +++++++++++++------- Web/static/js/package.json | 1 + Web/static/js/yarn.lock | 5 +++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Web/Presenters/templates/User/Settings.xml b/Web/Presenters/templates/User/Settings.xml index f8078d87..d844bcca 100644 --- a/Web/Presenters/templates/User/Settings.xml +++ b/Web/Presenters/templates/User/Settings.xml @@ -347,16 +347,22 @@
{tr("also_you_can_transfer_points", $thisUser->getCoins(), rawurlencode($csrfToken))|noescape}
-

- - {_on_your_account}
- {$thisUser->getCoins()}
- {_points_count}

- [{_have_voucher}?] - +

+ {_on_your_account} +
{$thisUser->getCoins()}
+ {_points_count}
+ [{_have_voucher}?]

+ {script "js/node_modules/textfit/textFit.min.js"} + + {elseif $isFinanceTU}

{_voucher_explanation} {_voucher_explanation_ex}

diff --git a/Web/static/js/package.json b/Web/static/js/package.json index d3b0c088..e29efb2e 100644 --- a/Web/static/js/package.json +++ b/Web/static/js/package.json @@ -14,6 +14,7 @@ "react-dom-factories": "^1.0.2", "requirejs": "^2.3.6", "soundjs": "^1.0.1", + "textfit": "^2.4.0", "umbrellajs": "^3.1.0" } } diff --git a/Web/static/js/yarn.lock b/Web/static/js/yarn.lock index 78235893..41341d82 100644 --- a/Web/static/js/yarn.lock +++ b/Web/static/js/yarn.lock @@ -271,6 +271,11 @@ soundjs@^1.0.1: resolved "https://registry.yarnpkg.com/soundjs/-/soundjs-1.0.1.tgz#99970542d28d0df2a1ebd061ae75c961a98c8180" integrity sha512-MgFPvmKYfpcNiE3X5XybNvScie3DMQlZgmNzUn4puBcpw64f4LqjH/fhM8Sb/eTJ8hK57Crr7mWy0bfJOqPj6Q== +textfit@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/textfit/-/textfit-2.4.0.tgz#80cba8006bfb9c3d9d552739257957bdda95c79c" + integrity sha512-/x4aoY5+/tJmu+iwpBH1yw75TFp86M6X15SvaaY/Eep7YySQYtqdOifEtfvVyMwzl7SZ+G4RQw00FD9g5R6i1Q== + trim-extra-html-whitespace@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/trim-extra-html-whitespace/-/trim-extra-html-whitespace-1.3.0.tgz#b47efb0d1a5f2a56a85cc45cea525651e93404cf" From 1472801874817ce8b259ec6e885470100830cc62 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Fri, 25 Mar 2022 14:05:44 +0300 Subject: [PATCH 05/54] VKAPI: Add attachments support for Wall methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO Refactor: Перенести вывод в отдельную функцию, чтоб не дублировать код --- VKAPI/Handlers/Wall.php | 53 ++++++++++++++++++++++++++++++ Web/Models/Entities/Photo.php | 14 ++++++++ Web/Models/Repositories/Albums.php | 8 +++++ 3 files changed, 75 insertions(+) diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index ec153695..5b0035de 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -22,6 +22,32 @@ final class Wall extends VKAPIRequestHandler foreach ($posts->getPostsFromUsersWall((int)$owner_id, 1, $count, $offset) as $post) { $from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId(); + + $attachments; + foreach($post->getChildren() as $attachment) + { + if($attachment instanceof \openvk\Web\Models\Entities\Photo) + { + $attachments[] = [ + "type" => "photo", + "photo" => [ + "album_id" => $attachment->getAlbum()->getId(), + "date" => $attachment->getPublicationTime()->timestamp(), + "id" => $attachment->getVirtualId(), + "owner_id" => $attachment->getOwner()->getId(), + "sizes" => array([ + "height" => $attachment->getDimentions()[1], + "url" => $attachment->getURL(), + "type" => "m", + "width" => $attachment->getDimentions()[0], + ]), + "text" => "", + "has_tags" => false + ] + ]; + } + } + $items[] = (object)[ "id" => $post->getVirtualId(), "from_id" => $from_id, @@ -35,6 +61,7 @@ final class Wall extends VKAPIRequestHandler "can_archive" => false, // TODO MAYBE "is_archived" => false, "is_pinned" => $post->isPinned(), + "attachments" => $attachments, "post_source" => (object)["type" => "vk"], "comments" => (object)[ "count" => $post->getCommentsCount(), @@ -127,6 +154,31 @@ final class Wall extends VKAPIRequestHandler $post = (new PostsRepo)->getPostById(intval($id[0]), intval($id[1])); if($post) { $from_id = get_class($post->getOwner()) == "openvk\Web\Models\Entities\Club" ? $post->getOwner()->getId() * (-1) : $post->getOwner()->getId(); + $attachments; + foreach($post->getChildren() as $attachment) + { + if($attachment instanceof \openvk\Web\Models\Entities\Photo) + { + $attachments[] = [ + "type" => "photo", + "photo" => [ + "album_id" => $attachment->getAlbum()->getId(), + "date" => $attachment->getPublicationTime()->timestamp(), + "id" => $attachment->getVirtualId(), + "owner_id" => $attachment->getOwner()->getId(), + "sizes" => array([ + "height" => $attachment->getDimentions()[1], + "url" => $attachment->getURL(), + "type" => "m", + "width" => $attachment->getDimentions()[0], + ]), + "text" => "", + "has_tags" => false + ] + ]; + } + } + $items[] = (object)[ "id" => $post->getVirtualId(), "from_id" => $from_id, @@ -141,6 +193,7 @@ final class Wall extends VKAPIRequestHandler "is_archived" => false, "is_pinned" => $post->isPinned(), "post_source" => (object)["type" => "vk"], + "attachments" => $attachments, "comments" => (object)[ "count" => $post->getCommentsCount(), "can_post" => 1 diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php index ecda93f6..0c0e8941 100644 --- a/Web/Models/Entities/Photo.php +++ b/Web/Models/Entities/Photo.php @@ -1,5 +1,7 @@ getRecord()->hash; + + return getimagesize($this->pathFromHash($hash)); + } + + function getAlbum(): ?Album + { + return (new Albums)->getAlbumByPhotoId($this); + } } diff --git a/Web/Models/Repositories/Albums.php b/Web/Models/Repositories/Albums.php index e1bcc671..0da26ff0 100644 --- a/Web/Models/Repositories/Albums.php +++ b/Web/Models/Repositories/Albums.php @@ -1,6 +1,7 @@ getContext()->table("album_relations")->where(["media" => $photo->getId()])->fetch(); + + return $this->get($dbalbum->collection); + } } From 4bf6fce260ee5e83ac901dc443530168346c3f04 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Fri, 25 Mar 2022 14:44:10 +0300 Subject: [PATCH 06/54] VKAPI: Fix 500 error if the post is published as anon --- VKAPI/Handlers/Wall.php | 2 +- Web/Models/Repositories/Albums.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index 5b0035de..a87b1e63 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -31,7 +31,7 @@ final class Wall extends VKAPIRequestHandler $attachments[] = [ "type" => "photo", "photo" => [ - "album_id" => $attachment->getAlbum()->getId(), + "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : null, "date" => $attachment->getPublicationTime()->timestamp(), "id" => $attachment->getVirtualId(), "owner_id" => $attachment->getOwner()->getId(), diff --git a/Web/Models/Repositories/Albums.php b/Web/Models/Repositories/Albums.php index 0da26ff0..0995a073 100644 --- a/Web/Models/Repositories/Albums.php +++ b/Web/Models/Repositories/Albums.php @@ -121,6 +121,6 @@ class Albums { $dbalbum = DatabaseConnection::i()->getContext()->table("album_relations")->where(["media" => $photo->getId()])->fetch(); - return $this->get($dbalbum->collection); + return $dbalbum->collection ? $this->get($dbalbum->collection) : null; } } From 4cf50790b132ef0ccf58abb01f7b0896ea0f630b Mon Sep 17 00:00:00 2001 From: veselcraft Date: Fri, 25 Mar 2022 14:46:40 +0300 Subject: [PATCH 07/54] that's why i need to refactor this --- VKAPI/Handlers/Wall.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index a87b1e63..9aa8ad37 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -162,7 +162,7 @@ final class Wall extends VKAPIRequestHandler $attachments[] = [ "type" => "photo", "photo" => [ - "album_id" => $attachment->getAlbum()->getId(), + "album_id" => $attachment->getAlbum() ? $attachment->getAlbum()->getId() : null, "date" => $attachment->getPublicationTime()->timestamp(), "id" => $attachment->getVirtualId(), "owner_id" => $attachment->getOwner()->getId(), From e6759f089f3745a2b1cdf5109a887b95fd1dc6d2 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Fri, 25 Mar 2022 16:36:38 +0300 Subject: [PATCH 08/54] Albums: fix getAlbumByPhotoId performance issue --- Web/Models/Repositories/Albums.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Models/Repositories/Albums.php b/Web/Models/Repositories/Albums.php index 0995a073..99c6c732 100644 --- a/Web/Models/Repositories/Albums.php +++ b/Web/Models/Repositories/Albums.php @@ -119,7 +119,7 @@ class Albums function getAlbumByPhotoId(Photo $photo): ?Album { - $dbalbum = DatabaseConnection::i()->getContext()->table("album_relations")->where(["media" => $photo->getId()])->fetch(); + $dbalbum = $this->context->table("album_relations")->where(["media" => $photo->getId()])->fetch(); return $dbalbum->collection ? $this->get($dbalbum->collection) : null; } From c4a0d5ed9868877521aa4405879fd8f773564150 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Fri, 25 Mar 2022 22:29:29 +0300 Subject: [PATCH 09/54] VKAPI: Fix stupid error when attachments duplicated over and over --- VKAPI/Handlers/Wall.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index 9aa8ad37..747991d1 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -83,6 +83,8 @@ final class Wall extends VKAPIRequestHandler $profiles[] = $from_id; else $groups[] = $from_id * -1; + + $attachments = null; // free attachments so it will not clone everythingg } if($extended == 1) @@ -214,6 +216,8 @@ final class Wall extends VKAPIRequestHandler $profiles[] = $from_id; else $groups[] = $from_id * -1; + + $attachments = null; // free attachments so it will not clone everythingg } } From 6966cbb8c54cef917613be4eb34003e0ecef6a7c Mon Sep 17 00:00:00 2001 From: Celestora Date: Sat, 26 Mar 2022 12:24:57 +0200 Subject: [PATCH 10/54] Check name validity before creating ChandlerUser Fixes #498 --- Web/Presenters/AuthPresenter.php | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Web/Presenters/AuthPresenter.php b/Web/Presenters/AuthPresenter.php index a80bbc68..8d15d3e2 100644 --- a/Web/Presenters/AuthPresenter.php +++ b/Web/Presenters/AuthPresenter.php @@ -4,6 +4,7 @@ use openvk\Web\Models\Entities\IP; use openvk\Web\Models\Entities\User; use openvk\Web\Models\Entities\PasswordReset; use openvk\Web\Models\Entities\EmailVerification; +use openvk\Web\Models\Exceptions\InvalidUserNameException; use openvk\Web\Models\Repositories\IPs; use openvk\Web\Models\Repositories\Users; use openvk\Web\Models\Repositories\Restores; @@ -88,20 +89,25 @@ final class AuthPresenter extends OpenVKPresenter if (strtotime($this->postParam("birthday")) > time()) $this->flashFail("err", tr("invalid_birth_date"), tr("invalid_birth_date_comment")); + try { + $user = new User; + $user->setFirst_Name($this->postParam("first_name")); + $user->setLast_Name($this->postParam("last_name")); + $user->setSex((int)($this->postParam("sex") === "female")); + $user->setEmail($this->postParam("email")); + $user->setSince(date("Y-m-d H:i:s")); + $user->setRegistering_Ip(CONNECTING_IP); + $user->setBirthday(strtotime($this->postParam("birthday"))); + $user->setActivated((int)!OPENVK_ROOT_CONF['openvk']['preferences']['security']['requireEmail']); + } catch(InvalidUserNameException $ex) { + $this->flashFail("err", tr("error"), tr("invalid_real_name")); + } + $chUser = ChandlerUser::create($this->postParam("email"), $this->postParam("password")); if(!$chUser) $this->flashFail("err", tr("failed_to_register"), tr("user_already_exists")); - - $user = new User; + $user->setUser($chUser->getId()); - $user->setFirst_Name($this->postParam("first_name")); - $user->setLast_Name($this->postParam("last_name")); - $user->setSex((int) ($this->postParam("sex") === "female")); - $user->setEmail($this->postParam("email")); - $user->setSince(date("Y-m-d H:i:s")); - $user->setRegistering_Ip(CONNECTING_IP); - $user->setBirthday(strtotime($this->postParam("birthday"))); - $user->setActivated((int) !OPENVK_ROOT_CONF['openvk']['preferences']['security']['requireEmail']); $user->save(); if(!is_null($referer)) { From da26c82531305f88095d1ebb6782b671ace68900 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko <50026114+maksalees@users.noreply.github.com> Date: Sat, 26 Mar 2022 15:11:13 +0100 Subject: [PATCH 11/54] L10n (Kazakh): Add missing semicolon --- locales/kk.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/kk.strings b/locales/kk.strings index 72665ff6..c20ef194 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -398,7 +398,7 @@ "default" = "әдепкі"; -"arbitrary_avatars" = "Ерікті" +"arbitrary_avatars" = "Ерікті"; "cut" = "Шаршы"; "round_avatars" = "Дөңгелек"; From f505887d7f35c6a70e8063e25ee6facbee0cd9b2 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Sat, 26 Mar 2022 19:53:39 +0300 Subject: [PATCH 12/54] VKAPI: Fix wall performance issue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit А пока никто не видет, пусть тут повисит текст одной песенки: Дай мені почути відверту мовчання тишу Ще раз зазирнути, утнути якусь дурницю Ти доповнила хором у соло останню нішу Відпустила і тягне-несе мене залізниця Дай докайфувати, допити останні ноти Вони і мене розвивають-крають, їх чути мушу Струмом віддавали торканння, погляди, фото Сканували і милом заслали ми наші душі Засмага зійде В купе купувати, в п'ятій піти Спрагою стане наступний день Але я залишаюсь там, як і ти Засмага зійде В купе купувати, в п'ятій піти Спрагою стане наступний день Але я залишаюсь там, як і ти Потяги в полиці штовхали у різні боки Телефони стискали, чекали картки ввімкнутись Залишили по собі ціньми в камінні мокрім Незабаром побачитись з вами, або почутись Не потрібні тіла нам ваші анітрохи Просто ближче підходьте й вгору здіймайте руки Сумувати, гаяти час, плести неспокій Так буває, що спогади народжують звуки Засмага зійде В купе купувати, в п'ятій піти Спрагою стане наступний день Але я залишаюсь там, як і ти --- VKAPI/Handlers/Wall.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/VKAPI/Handlers/Wall.php b/VKAPI/Handlers/Wall.php index 747991d1..59f8c751 100644 --- a/VKAPI/Handlers/Wall.php +++ b/VKAPI/Handlers/Wall.php @@ -36,10 +36,10 @@ final class Wall extends VKAPIRequestHandler "id" => $attachment->getVirtualId(), "owner_id" => $attachment->getOwner()->getId(), "sizes" => array([ - "height" => $attachment->getDimentions()[1], + "height" => 500, // Для временного компросима оставляю статическое число. Если каждый раз обращаться к файлу за количеством пикселов, то наступает пuпuська полная с производительностью, так что пока так "url" => $attachment->getURL(), "type" => "m", - "width" => $attachment->getDimentions()[0], + "width" => 500, ]), "text" => "", "has_tags" => false @@ -169,10 +169,10 @@ final class Wall extends VKAPIRequestHandler "id" => $attachment->getVirtualId(), "owner_id" => $attachment->getOwner()->getId(), "sizes" => array([ - "height" => $attachment->getDimentions()[1], + "height" => 500, // я ещё я заебался вставлять одинаковый код в два разных места "url" => $attachment->getURL(), "type" => "m", - "width" => $attachment->getDimentions()[0], + "width" => 500, ]), "text" => "", "has_tags" => false From 6588734caae0bbeecd583afa2870b320e19e1454 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Sat, 26 Mar 2022 21:48:42 +0100 Subject: [PATCH 13/54] Support: Allow agents to prevent users from creating tickets --- Web/Models/Entities/User.php | 10 ++++ Web/Presenters/SupportPresenter.php | 38 ++++++++++++++- Web/Presenters/templates/Support/Index.xml | 30 ++++++++---- Web/Presenters/templates/User/View.xml | 57 +++++++++++++++++++++- Web/routes.yml | 4 ++ install/sqls/00019-block-in-support.sql | 1 + locales/en.strings | 5 ++ locales/ru.strings | 5 ++ 8 files changed, 137 insertions(+), 13 deletions(-) create mode 100644 install/sqls/00019-block-in-support.sql diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 64b689e4..c4888d75 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -214,6 +214,11 @@ class User extends RowModel { return $this->getRecord()->block_reason; } + + function getBanInSupportReason(): ?string + { + return $this->getRecord()->block_in_support_reason; + } function getType(): int { @@ -673,6 +678,11 @@ class User extends RowModel { return !is_null($this->getBanReason()); } + + function isBannedInSupport(): bool + { + return !is_null($this->getBanInSupportReason()); + } function isOnline(): bool { diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php index a96ac465..9c2bcc8e 100644 --- a/Web/Presenters/SupportPresenter.php +++ b/Web/Presenters/SupportPresenter.php @@ -1,7 +1,7 @@ template->tickets = $this->tickets->getTicketsByUserId($this->user->id, $this->template->page); } + if($this->template->mode === "new") + $this->template->banReason = $this->user->identity->getBanInSupportReason(); + if($_SERVER["REQUEST_METHOD"] === "POST") { + if($this->user->identity->isBannedInSupport()) + $this->flashFail("err", tr("not_enough_permissions"), tr("not_enough_permissions_comment")); + if(!empty($this->postParam("name")) && !empty($this->postParam("text"))) { $this->willExecuteWriteAction(); @@ -268,4 +274,32 @@ final class SupportPresenter extends OpenVKPresenter exit(header("HTTP/1.1 200 OK")); } -} \ No newline at end of file + + function renderQuickBanInSupport(int $id): void + { + $this->assertPermission("openvk\Web\Models\Entities\TicketReply", "write", 0); + $this->assertNoCSRF(); + + $user = (new Users)->get($id); + if(!$user) + exit(json_encode([ "error" => "User does not exist" ])); + + $user->setBlock_In_Support_Reason($this->queryParam("reason")); + $user->save(); + $this->returnJson([ "success" => true, "reason" => $this->queryParam("reason") ]); + } + + function renderQuickUnbanInSupport(int $id): void + { + $this->assertPermission("openvk\Web\Models\Entities\TicketReply", "write", 0); + $this->assertNoCSRF(); + + $user = (new Users)->get($id); + if(!$user) + exit(json_encode([ "error" => "User does not exist" ])); + + $user->setBlock_In_Support_Reason(null); + $user->save(); + $this->returnJson([ "success" => true ]); + } +} diff --git a/Web/Presenters/templates/Support/Index.xml b/Web/Presenters/templates/Support/Index.xml index 8f0f8737..133cf073 100644 --- a/Web/Presenters/templates/Support/Index.xml +++ b/Web/Presenters/templates/Support/Index.xml @@ -26,16 +26,26 @@
{if $isNew} -
-
-
-

-

- -

-
-
-
+ {if !is_null($banReason)} +
+ {_'banned_alt'} +
+

+ {tr("banned_in_support_1", htmlentities($thisUser->getCanonicalName()))|noescape}
+ {tr("banned_in_support_2", htmlentities($banReason))|noescape} +

+ {else} +
+
+
+

+

+ +

+
+
+
+ {/if} {/if} {/if} diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index f421925c..c9457cba 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -93,6 +93,16 @@ {_warn_user_action} {/if} + + {if $thisUser->getChandlerUser()->can('write')->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)} + + {if $user->isBannedInSupport()} + {_unban_in_support_user_action} + {else} + {_ban_in_support_user_action} + {/if} + + {/if} {_send_gift} {_"send_message"} @@ -526,7 +536,7 @@ function warnUser() { uBanMsgTxt = "Вы собираетесь предупредить пользователя " + {$user->getCanonicalName()} + "."; uBanMsgTxt += "
Мы отправим уведомление пользователю в личные сообщения от имени аккаунта администратора."; - uBanMsgTxt += "

Текст предупреждения: " + uBanMsgTxt += "

Текст предупреждения: "; MessageBox("Выдать предупреждение " + {$user->getFirstName()}, uBanMsgTxt, ["Подтвердить", "Отмена"], [ (function() { @@ -546,6 +556,51 @@ } + + diff --git a/Web/routes.yml b/Web/routes.yml index 2c22687f..a31bffad 100644 --- a/Web/routes.yml +++ b/Web/routes.yml @@ -271,6 +271,8 @@ routes: handler: "Admin->gifts" - url: "/admin/ban/{num}" handler: "Admin->quickBan" + - url: "/admin/unban/{num}" + handler: "Admin->quickUnban" - url: "/admin/warn/{num}" handler: "Admin->quickWarn" - url: "/admin/support/ban/{num}" diff --git a/locales/en.strings b/locales/en.strings index 5d138899..a305cbdd 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -834,6 +834,7 @@ "manage_user_action" = "Manage user"; "manage_group_action" = "Manage group"; "ban_user_action" = "Ban user"; +"unban_user_action" = "Unban user"; "warn_user_action" = "Warn user"; "ban_in_support_user_action" = "Ban in support"; "unban_in_support_user_action" = "Unban in support"; diff --git a/locales/ru.strings b/locales/ru.strings index cc98e2d8..0c71d919 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -877,6 +877,7 @@ "manage_user_action" = "Управление пользователем"; "manage_group_action" = "Управление группой"; "ban_user_action" = "Заблокировать пользователя"; +"unban_user_action" = "Разблокировать пользователя"; "warn_user_action" = "Предупредить пользователя"; "ban_in_support_user_action" = "Заблокировать в поддержке"; "unban_in_support_user_action" = "Разблокировать в поддержке"; From f1d923f5806455b067d407c93e137b07d1c51def Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Sun, 27 Mar 2022 11:58:29 +0200 Subject: [PATCH 15/54] Support: Allow agents to prevent banned users from creating tickets --- Web/Presenters/templates/User/banned.xml | 59 ++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 3 deletions(-) diff --git a/Web/Presenters/templates/User/banned.xml b/Web/Presenters/templates/User/banned.xml index f1e6f8c1..f0e7e661 100644 --- a/Web/Presenters/templates/User/banned.xml +++ b/Web/Presenters/templates/User/banned.xml @@ -4,13 +4,21 @@ {tr("user_banned", htmlentities($user->getFirstName()))|noescape}
{_"user_banned_comment"} {$user->getBanReason()}.

-

-
{_unban_user_action} +

+
+ {_unban_user_action} + + {if $user->isBannedInSupport()} + {_unban_in_support_user_action} + {else} + {_ban_in_support_user_action} + {/if} +

+ + From c55bb779ccfe36d47f5927d4f72c5fef1a955568 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Sun, 27 Mar 2022 12:11:29 +0200 Subject: [PATCH 16/54] Users: Hide button to increase rating if display of rating is disabled in settings Closes #504 --- Web/Presenters/templates/User/View.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index 7af04225..aaac140c 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -72,7 +72,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()}
- Фотография пользователя
@@ -36,7 +36,7 @@ {var _author = $lastMsg->getSender()}
- Фотография пользователя
diff --git a/Web/Presenters/templates/Notes/List.xml b/Web/Presenters/templates/Notes/List.xml index 5849337b..838b6d8b 100644 --- a/Web/Presenters/templates/Notes/List.xml +++ b/Web/Presenters/templates/Notes/List.xml @@ -68,7 +68,7 @@
- +
diff --git a/Web/Presenters/templates/Notification/Feed.xml b/Web/Presenters/templates/Notification/Feed.xml index cb2474da..427fd616 100644 --- a/Web/Presenters/templates/Notification/Feed.xml +++ b/Web/Presenters/templates/Notification/Feed.xml @@ -26,7 +26,7 @@ {/block} {block preview} - + {/block} {block name} diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml index f74f319c..52ac12b2 100644 --- a/Web/Presenters/templates/Photos/AlbumList.xml +++ b/Web/Presenters/templates/Photos/AlbumList.xml @@ -43,7 +43,7 @@ {block preview} {var cover = $x->getCoverPhoto()} - {var preview = is_null($cover) ? "/assets/packages/static/openvk/img/camera_200.png" : $cover->getURL()} + {var preview = is_null($cover) ? "/assets/packages/static/openvk/img/camera_200.png" : $cover->getURLBySizeId("normal")} {$x->getName()} diff --git a/Web/Presenters/templates/Photos/Photo.xml b/Web/Presenters/templates/Photos/Photo.xml index dbd89013..a28f0f90 100644 --- a/Web/Presenters/templates/Photos/Photo.xml +++ b/Web/Presenters/templates/Photos/Photo.xml @@ -21,7 +21,7 @@ {block content}
- +
diff --git a/Web/Presenters/templates/Search/Index.xml b/Web/Presenters/templates/Search/Index.xml index 0a346f71..1814f6b7 100644 --- a/Web/Presenters/templates/Search/Index.xml +++ b/Web/Presenters/templates/Search/Index.xml @@ -50,7 +50,7 @@ {/block} {block preview} - {_ + {_ {/block} {block name} diff --git a/Web/Presenters/templates/Support/AnswerTicket.xml b/Web/Presenters/templates/Support/AnswerTicket.xml index a35ad6a6..c322aa08 100644 --- a/Web/Presenters/templates/Support/AnswerTicket.xml +++ b/Web/Presenters/templates/Support/AnswerTicket.xml @@ -47,7 +47,7 @@ {if $comment->getUType() === 0} - + {else} diff --git a/Web/Presenters/templates/Support/View.xml b/Web/Presenters/templates/Support/View.xml index 4ef1ce2b..c1febe7f 100644 --- a/Web/Presenters/templates/Support/View.xml +++ b/Web/Presenters/templates/Support/View.xml @@ -60,7 +60,7 @@ {if $comment->getUType() === 0} - + {else} diff --git a/Web/Presenters/templates/User/Friends.xml b/Web/Presenters/templates/User/Friends.xml index 344c34be..7f68f296 100644 --- a/Web/Presenters/templates/User/Friends.xml +++ b/Web/Presenters/templates/User/Friends.xml @@ -85,7 +85,7 @@ {/block} {block preview} - Фотография группы + Фотография пользователя {/block} {block name} @@ -145,4 +145,4 @@ {/if} {/if} -{/block} \ No newline at end of file +{/block} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 4006cb92..bf963796 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -48,7 +48,7 @@ {/block} {block preview} - Фотография группы + Фотография группы {/block} {block name}{/block} diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index aaac140c..96496a9d 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -7,7 +7,7 @@ - + @@ -62,7 +62,7 @@
- {$user->getCanonicalName()} @@ -190,7 +190,7 @@
- +
@@ -218,7 +218,7 @@ {var cover = $album->getCoverPhoto()}
diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml index 65072458..c7a003b3 100644 --- a/Web/Presenters/templates/components/comment.xml +++ b/Web/Presenters/templates/components/comment.xml @@ -8,7 +8,7 @@ - + diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index 5755e865..d9552aa6 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -9,7 +9,7 @@ - + {_online} diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml index 1a3c4c84..1f29521a 100644 --- a/Web/Presenters/templates/components/post/oldpost.xml +++ b/Web/Presenters/templates/components/post/oldpost.xml @@ -5,7 +5,7 @@ - + {_online} From be83a72be2ce89a18a158cadb6ceabdf5a3fc513 Mon Sep 17 00:00:00 2001 From: Celestora Date: Tue, 5 Apr 2022 15:54:53 +0300 Subject: [PATCH 43/54] Add build-images to openvkctl --- .idea/openvk.iml | 10 + .idea/php.xml | 10 + CLI/RebuildImagesCommand.php | 64 +++ Web/Models/Entities/Photo.php | 6 +- composer.json | 3 +- composer.lock | 804 +++++++++++++++++++++++++++++++++- openvkctl | 13 + 7 files changed, 902 insertions(+), 8 deletions(-) create mode 100644 CLI/RebuildImagesCommand.php create mode 100644 openvkctl diff --git a/.idea/openvk.iml b/.idea/openvk.iml index b5f07aa6..3d72b6b1 100644 --- a/.idea/openvk.iml +++ b/.idea/openvk.iml @@ -28,6 +28,16 @@ + + + + + + + + + + diff --git a/.idea/php.xml b/.idea/php.xml index 22c50b95..5aabe8cd 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -29,6 +29,16 @@ + + + + + + + + + + diff --git a/CLI/RebuildImagesCommand.php b/CLI/RebuildImagesCommand.php new file mode 100644 index 00000000..cd34ee2e --- /dev/null +++ b/CLI/RebuildImagesCommand.php @@ -0,0 +1,64 @@ +images = DatabaseConnection::i()->getContext()->table("photos"); + + parent::__construct(); + } + + protected function configure(): void + { + $this->setDescription("Create resized versions of images") + ->setHelp("This command allows you to resize all your images after configuration change") + ->addOption("upgrade-only", "U", InputOption::VALUE_NEGATABLE, "Only upgrade images which aren't resized?"); + } + + protected function execute(InputInterface $input, OutputInterface $output): int + { + $header = $output->section(); + $counter = $output->section(); + + $header->writeln([ + "Image Rebuild Utility", + "=====================", + "", + ]); + + $filter = ["deleted" => false]; + if($input->getOption("upgrade-only")) + $filter["sizes"] = NULL; + + $selection = $this->images->where($filter); + $header->writeln([ + "Total of " . $selection->count() . " images found.", + "", + ]); + + $i = 0; + foreach($selection as $img) { + $photo = new Photo($img); + $photo->getSizes(true, true); + $photo->getDimensions(); + + $counter->overwrite("Processed " . ++$i . " images..."); + } + + $counter->overwrite("Processing finished :3"); + + return Command::SUCCESS; + } +} \ No newline at end of file diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php index 63207b8a..6c897824 100644 --- a/Web/Models/Entities/Photo.php +++ b/Web/Models/Entities/Photo.php @@ -108,11 +108,11 @@ class Photo extends Media DB::i()->getContext()->table("album_relations")->where("media", $this->getRecord()->id)->delete(); } - function getSizes(): ?array + function getSizes(bool $upgrade = false, bool $forceUpdate = false): ?array { $sizes = $this->getRecord()->sizes; - if(!$sizes) { - if(OPENVK_ROOT_CONF["openvk"]["preferences"]["photos"]["upgradeStructure"]) { + if(!$sizes || $forceUpdate) { + if($forceUpdate || $upgrade || OPENVK_ROOT_CONF["openvk"]["preferences"]["photos"]["upgradeStructure"]) { $hash = $this->getRecord()->hash; $this->saveImageResizedCopies($this->pathFromHash($hash), $hash); $this->save(); diff --git a/composer.json b/composer.json index d6e2d5e5..25520ce5 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "vearutop/php-obscene-censor-rus": "dev-master", "erusev/parsedown": "dev-master", "bhaktaraz/php-rss-generator": "dev-master", - "ext-simplexml": "*" + "ext-simplexml": "*", + "symfony/console": "5.4.x-dev" }, "minimum-stability": "dev" } diff --git a/composer.lock b/composer.lock index 99071bc9..67f139eb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2c94032cae911ca438bbcfc46c346961", + "content-hash": "878bd996183ccbb15637a7399ba03ab9", "packages": [ { "name": "al/emoji-detector", @@ -852,6 +852,54 @@ }, "time": "2016-08-06T20:24:11+00:00" }, + { + "name": "psr/container", + "version": "1.x-dev", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, { "name": "psr/http-message", "version": "dev-master", @@ -1085,6 +1133,336 @@ }, "time": "2022-01-06T19:41:32+00:00" }, + { + "name": "symfony/console", + "version": "5.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/900275254f0a1a2afff1ab0e11abd5587a10e1d6", + "reference": "900275254f0a1a2afff1ab0e11abd5587a10e1d6", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" + }, + "conflict": { + "psr/log": ">=3", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", + "symfony/lock": "<4.4", + "symfony/process": "<4.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" + }, + "require-dev": { + "psr/log": "^1|^2", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v5.4.7" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-31T17:09:19+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "2.5.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/2.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.25.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "30885182c981ab175d4d034db0f6f469898070ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-10-20T20:35:02+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.25.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783", + "reference": "81b86b50cf841a64252b439e738e97f4a34e2783", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-23T21:10:46+00:00" + }, { "name": "symfony/polyfill-intl-idn", "version": "v1.24.0", @@ -1256,6 +1634,89 @@ ], "time": "2021-02-19T12:13:01+00:00" }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.25.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-11-30T18:21:41+00:00" + }, { "name": "symfony/polyfill-php72", "version": "v1.24.0", @@ -1332,6 +1793,338 @@ ], "time": "2021-05-27T09:17:38+00:00" }, + { + "name": "symfony/polyfill-php73", + "version": "v1.25.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-06-05T21:20:04+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.25.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-04T08:16:47+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "2.5.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/2.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-03-13T20:07:29+00:00" + }, + { + "name": "symfony/string", + "version": "5.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/92043b7d8383e48104e411bc9434b260dbeb5a10", + "reference": "92043b7d8383e48104e411bc9434b260dbeb5a10", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v5.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, { "name": "vearutop/php-obscene-censor-rus", "version": "dev-master", @@ -1562,11 +2355,14 @@ "chillerlan/php-qrcode": 20, "vearutop/php-obscene-censor-rus": 20, "erusev/parsedown": 20, - "bhaktaraz/php-rss-generator": 20 + "bhaktaraz/php-rss-generator": 20, + "symfony/console": 20 }, "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "ext-simplexml": "*" + }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } diff --git a/openvkctl b/openvkctl new file mode 100644 index 00000000..6c913aeb --- /dev/null +++ b/openvkctl @@ -0,0 +1,13 @@ +#!/usr/bin/env php +ignite(true); + +$application = new Application(); +$application->add(new CLI\RebuildImagesCommand); + +$application->run(); \ No newline at end of file From 599c378b6ff62563c6a62bd09ce001c8de523714 Mon Sep 17 00:00:00 2001 From: Celestora Date: Tue, 5 Apr 2022 16:13:25 +0300 Subject: [PATCH 44/54] Remove redundant getDimensions --- Web/Models/Entities/Photo.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php index 6c897824..73f13393 100644 --- a/Web/Models/Entities/Photo.php +++ b/Web/Models/Entities/Photo.php @@ -81,7 +81,6 @@ class Photo extends Media $image->resize(8192, 4320, Image::SHRINK_ONLY | Image::FIT); $image->save($this->pathFromHash($hash), 92, Image::JPEG); $this->saveImageResizedCopies($filename, $hash); - $this->getDimensions(); # propagate dimensions info in DB return true; } From 15385ad69d3af11dfd6e677fddd047a874b6bfd3 Mon Sep 17 00:00:00 2001 From: Celestora Date: Tue, 5 Apr 2022 22:36:46 +0300 Subject: [PATCH 45/54] Add auto-resolution for weird directory files error in Photo --- Web/Models/Entities/Photo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Web/Models/Entities/Photo.php b/Web/Models/Entities/Photo.php index 73f13393..0f223679 100644 --- a/Web/Models/Entities/Photo.php +++ b/Web/Models/Entities/Photo.php @@ -57,8 +57,10 @@ class Photo extends Media { $dir = dirname($this->pathFromHash($hash)); $dir = "$dir/$hash" . "_cropped"; - if(!is_dir($dir)) + if(!is_dir($dir)) { + @unlink($dir); # Added to transparently bypass issues with dead pesudofolders summoned by buggy SWIFT impls (selectel) mkdir($dir); + } $sizes = simplexml_load_file(OPENVK_ROOT . "/data/photosizes.xml"); if(!$sizes) From c1317a6ff8ef6883ec451524b679b4540298aa38 Mon Sep 17 00:00:00 2001 From: Celestora Date: Wed, 6 Apr 2022 11:22:43 +0300 Subject: [PATCH 46/54] Enrich progress reporting for build-images command --- CLI/RebuildImagesCommand.php | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/CLI/RebuildImagesCommand.php b/CLI/RebuildImagesCommand.php index cd34ee2e..cc5a4be5 100644 --- a/CLI/RebuildImagesCommand.php +++ b/CLI/RebuildImagesCommand.php @@ -1,7 +1,7 @@ getOption("upgrade-only")) $filter["sizes"] = NULL; - $selection = $this->images->where($filter); + $selection = $this->images->select("id")->where($filter); + $totalPics = $selection->count(); $header->writeln([ - "Total of " . $selection->count() . " images found.", + "Total of $totalPics images found.", "", ]); - $i = 0; - foreach($selection as $img) { - $photo = new Photo($img); + $count = 0; + $avgTime = NULL; + $begin = new \DateTimeImmutable("now"); + foreach($selection as $idHolder) { + $start = microtime(true); + $photo = (new Photos)->get($idHolder->id); $photo->getSizes(true, true); $photo->getDimensions(); - $counter->overwrite("Processed " . ++$i . " images..."); + $timeConsumed = microtime(true) - $start; + if(!$avgTime) + $avgTime = $timeConsumed; + else + $avgTime = ($avgTime + $timeConsumed) / 2; + + $eta = $begin->getTimestamp() + ceil($totalPics * $avgTime); + $int = (new \DateTimeImmutable("now"))->diff(new \DateTimeImmutable("@$eta")); + $int = $int->d . "d" . $int->h . "h" . $int->i . "m" . $int->s . "s"; + $pct = floor(100 * ($count / $totalPics)); + + $counter->overwrite("Processed " . ++$count . " images... ($pct% $int left)"); } $counter->overwrite("Processing finished :3"); From 6c0d543d264f07367f1ac9427fea264ddbc004f9 Mon Sep 17 00:00:00 2001 From: Celestora Date: Wed, 6 Apr 2022 12:47:56 +0300 Subject: [PATCH 47/54] Add back ability to create albums in groups --- Web/Presenters/templates/Photos/AlbumList.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Web/Presenters/templates/Photos/AlbumList.xml b/Web/Presenters/templates/Photos/AlbumList.xml index 52ac12b2..e03a6c63 100644 --- a/Web/Presenters/templates/Photos/AlbumList.xml +++ b/Web/Presenters/templates/Photos/AlbumList.xml @@ -23,9 +23,11 @@ {else} {tr("albums", $count)} {/if} - + +  |  - {_create_album} + {var isClub = ($owner instanceof \openvk\Web\Models\Entities\Club)} + {_create_album}
From 24f0f3a3f43a011d80ff86aec96c30f268739665 Mon Sep 17 00:00:00 2001 From: Celestora Date: Wed, 6 Apr 2022 23:59:31 +0300 Subject: [PATCH 48/54] Also report errors in build-images --- CLI/RebuildImagesCommand.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CLI/RebuildImagesCommand.php b/CLI/RebuildImagesCommand.php index cc5a4be5..937978b1 100644 --- a/CLI/RebuildImagesCommand.php +++ b/CLI/RebuildImagesCommand.php @@ -6,6 +6,7 @@ use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; +use Nette\Utils\ImageException; class RebuildImagesCommand extends Command { @@ -49,14 +50,20 @@ class RebuildImagesCommand extends Command "", ]); + $errors = 0; $count = 0; $avgTime = NULL; $begin = new \DateTimeImmutable("now"); foreach($selection as $idHolder) { $start = microtime(true); - $photo = (new Photos)->get($idHolder->id); - $photo->getSizes(true, true); - $photo->getDimensions(); + + try { + $photo = (new Photos)->get($idHolder->id); + $photo->getSizes(true, true); + $photo->getDimensions(); + } catch(ImageException $ex) { + $errors++; + } $timeConsumed = microtime(true) - $start; if(!$avgTime) @@ -69,7 +76,7 @@ class RebuildImagesCommand extends Command $int = $int->d . "d" . $int->h . "h" . $int->i . "m" . $int->s . "s"; $pct = floor(100 * ($count / $totalPics)); - $counter->overwrite("Processed " . ++$count . " images... ($pct% $int left)"); + $counter->overwrite("Processed " . ++$count . " images... ($pct% $int left $errors/$count fail)"); } $counter->overwrite("Processing finished :3"); From ccab9b39d5db5dec25a2a27d0bd5365144bd19b4 Mon Sep 17 00:00:00 2001 From: Celestora Date: Fri, 8 Apr 2022 11:40:20 +0300 Subject: [PATCH 49/54] Use minimized images in posts --- Web/Presenters/templates/components/attachment.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Presenters/templates/components/attachment.xml b/Web/Presenters/templates/components/attachment.xml index 4689723e..7abca0f4 100644 --- a/Web/Presenters/templates/components/attachment.xml +++ b/Web/Presenters/templates/components/attachment.xml @@ -2,7 +2,7 @@ {if !$attachment->isDeleted()} {var link = "/photo" . ($attachment->isAnonymous() ? ("s/" . base_convert((string) $attachment->getId(), 10, 32)) : $attachment->getPrettyId())} - {$attachment->getDescription()} + {$attachment->getDescription()} {else} From 008e42b26de83c7a73f561221dcfda67aac483f6 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Fri, 8 Apr 2022 12:59:35 +0300 Subject: [PATCH 50/54] Make openvkctl executable --- openvkctl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 openvkctl diff --git a/openvkctl b/openvkctl old mode 100644 new mode 100755 From 7bf540295a66a8b897aa52cee77f2911a1f9fd0e Mon Sep 17 00:00:00 2001 From: Alexander Minkin Date: Fri, 8 Apr 2022 19:56:40 +0300 Subject: [PATCH 51/54] Auth: Remove autocompletion for TOTP input --- Web/Presenters/templates/Auth/LoginSecondFactor.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Presenters/templates/Auth/LoginSecondFactor.xml b/Web/Presenters/templates/Auth/LoginSecondFactor.xml index 48462595..05c5d986 100644 --- a/Web/Presenters/templates/Auth/LoginSecondFactor.xml +++ b/Web/Presenters/templates/Auth/LoginSecondFactor.xml @@ -18,7 +18,7 @@ {_code}: - + From bcc22fa359b65223e7e114b7eb38c7ee1bc066fa Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sat, 9 Apr 2022 08:54:24 +0300 Subject: [PATCH 52/54] Global: Stylize #test-label [CSS] Just to make that block a lil better. --- Web/static/css/style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Web/static/css/style.css b/Web/static/css/style.css index ebf359f8..5a70d404 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1334,6 +1334,15 @@ body.scrolled .toTop:hover { font-size: 15px; } +#test-label { + padding: 8pt; + margin: 4pt; + border: 1px solid #9a205e; + background-color: #f5e9ec; + position: fixed; + font-weight: bold; +} + .post-upload { margin-top: 11px; margin-left: 3px; From 3c4b3221e2083894d145ae04dc1959d35eeced62 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sat, 9 Apr 2022 09:14:11 +0300 Subject: [PATCH 53/54] Global: Add keyboard shortcuts for some sections This commit adds keyboard shortcuts for Home, Search, User Profile, Wall, Notifications, and Admin Panel for (hopefully) quick navigation through these sections. Keep in mind that the hints to these sections (e.g. "[Alt+Shift+]") will only be relevant to modern browsers. Refer to this link: https://developer.mozilla.org/docs/Web/HTML/Global_attributes/accesskey --- Web/Presenters/templates/@layout.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 79074af3..9f5eea9a 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -103,7 +103,7 @@
{ifset $thisUser}
- {_header_home} + {_header_home}
{_header_groups} @@ -122,7 +122,7 @@
- +
{else} @@ -144,7 +144,7 @@ {ifset $thisUser} {if !$thisUser->isBanned() XOR !$thisUser->isActivated()} {_edit_button} - {_my_page} + {_my_page} {_my_friends} @@ -161,8 +161,8 @@ {_my_notes} {_my_groups} - {_my_feed} - {_my_feedback} + {_my_feed} + {_my_feedback} {if $thisUser->getNotificationsCount() > 0} ({$thisUser->getNotificationsCount()}) {/if} @@ -173,7 +173,7 @@ {var canAccessHelpdesk = $thisUser->getChandlerUser()->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)} {var menuLinksAvaiable = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')}
- Админ-панель + Админ-панель Helpdesk {if $helpdeskTicketNotAnsweredCount > 0} ({$helpdeskTicketNotAnsweredCount}) From af44d05c9764feb884e54d2585a8bcb9500d0b08 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sat, 9 Apr 2022 09:53:41 +0300 Subject: [PATCH 54/54] Locales: su_SU hotfix =)) --- locales/su.strings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/su.strings b/locales/su.strings index 27f7ccad..4f757812 100644 --- a/locales/su.strings +++ b/locales/su.strings @@ -255,7 +255,7 @@ "hidden_yes" = "Скрыт: Да"; "hidden_no" = "Скрыт: Нет"; "group_allow_post_for_everyone" = "Разрешить публиковать записи всем"; -group_hide_from_global_feed" = "Не отображать записи в публичной доске"; +"group_hide_from_global_feed" = "Не отображать записи в публичной доске"; "statistics" = "Статистика"; "group_administrators_list" = "Список админов"; "group_display_only_creator" = "Отображать только создателя группы"; @@ -775,7 +775,7 @@ group_hide_from_global_feed" = "Не отображать записи в пуб "token_manipulation_error" = "Ошибка манипулирования токеном"; "token_manipulation_error_comment" = "Токен недействителен или истёк"; -"profile_changed" = "Досье изменёно"; +"profile_changed" = "Досье изменено"; "profile_changed_comment" = "Товарищ, орган одобрил изменение вашего досье."; "profile_not_found" = "Гражданин не найден.";