Skip to content

Migrate trophies to form builder, l10n storage, file uploads and object filters #6736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BurntimeX merged 1 commit into from
Oct 15, 2026
Merged

Migrate trophies to form builder, l10n storage, file uploads and object filters #6736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 52 additions & 97 deletions com.woltlab.wcf/objectType.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,98 +575,6 @@
<categoryname>com.woltlab.wcf.user</categoryname>
</type>
<!-- /stat handlers -->
<!-- trophy conditions -->
<type>
<name>com.woltlab.wcf.username</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserUsernameCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.email</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserEmailCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.userGroup</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserGroupCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.languages</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserLanguageCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.registrationDate</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserRegistrationDateCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.registrationDateInterval</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserRegistrationDateIntervalCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.avatar</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserAvatarCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.signature</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserSignatureCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.coverPhoto</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserCoverPhotoCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.state</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserStateCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.activityPoints</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
<conditiongroup>contents</conditiongroup>
<propertyname>activityPoints</propertyname>
<minvalue>0</minvalue>
</type>
<type>
<name>com.woltlab.wcf.likesReceived</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
<conditiongroup>contents</conditiongroup>
<propertyname>likesReceived</propertyname>
<minvalue>0</minvalue>
</type>
<type>
<name>com.woltlab.wcf.userTrophyCondition</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserTrophyCondition</classname>
<conditiongroup>general</conditiongroup>
</type>
<type>
<name>com.woltlab.wcf.trophyPoints</name>
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
<classname>wcf\system\condition\UserIntegerPropertyCondition</classname>
<conditiongroup>contents</conditiongroup>
<propertyname>trophyPoints</propertyname>
<minvalue>0</minvalue>
</type>
<!-- /trophy conditions -->
<!-- ad locations -->
<type>
<name>com.woltlab.wcf.logo</name>
Expand Down Expand Up @@ -1263,6 +1171,11 @@
<definitionname>com.woltlab.wcf.file</definitionname>
<classname>wcf\system\file\processor\ReactionTypeIconFileProcessor</classname>
</type>
<type>
<name>com.woltlab.wcf.trophy.image</name>
<definitionname>com.woltlab.wcf.file</definitionname>
<classname>wcf\system\file\processor\TrophyImageFileProcessor</classname>
</type>
</import>
<delete>
<!-- sitemap objects are registered through `wcf\event\sitemap\SitemapObjectCollecting` since 6.3 -->
Expand Down Expand Up @@ -1323,7 +1236,7 @@
<type name="com.woltlab.wcf.moderation.queue">
<definitionname>com.woltlab.wcf.clipboardItem</definitionname>
</type>
<!-- legacy conditions of notices, ads and user group assignments are replaced by object filters since 6.3 -->
<!-- legacy conditions of notices, ads, user group assignments and trophies are replaced by object filters since 6.3 -->
<type name="com.woltlab.wcf.username">
<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
</type>
Expand Down Expand Up @@ -1369,6 +1282,51 @@
<type name="com.woltlab.wcf.trophyPoints">
<definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
</type>
<type name="com.woltlab.wcf.username">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.email">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.userGroup">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.languages">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.registrationDate">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.registrationDateInterval">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.avatar">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.signature">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.coverPhoto">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.state">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.activityPoints">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.likesReceived">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.userTrophyCondition">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.trophyPoints">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.userOptions">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<type name="com.woltlab.wcf.page">
<definitionname>com.woltlab.wcf.condition.notice</definitionname>
</type>
Expand Down Expand Up @@ -1541,10 +1499,7 @@
<type name="com.woltlab.wcf.user.multifactor">
<definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
</type>
<!-- user option conditions are not supported until trophies and the bulk processing use object filters -->
<type name="com.woltlab.wcf.userOptions">
<definitionname>com.woltlab.wcf.condition.trophy</definitionname>
</type>
<!-- user option conditions are not supported until the bulk processing uses object filters -->
<type name="com.woltlab.wcf.userOptions">
<definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
</type>
Expand Down
1 change: 1 addition & 0 deletions com.woltlab.wcf/objectTypeDefinition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
<name>com.woltlab.wcf.condition.userGroupAssignment</name>
<interfacename>wcf\system\condition\IUserCondition</interfacename>
</definition>
<!-- deprecated since 6.3, only kept for the migration of legacy conditions to object filters -->
<definition>
<name>com.woltlab.wcf.condition.trophy</name>
<interfacename>wcf\system\condition\IUserCondition</interfacename>
Expand Down
2 changes: 2 additions & 0 deletions com.woltlab.wcf/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,13 @@
The following steps require the new files and must run after the `objectType` PIP:
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_userRankImage.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_reactionTypeIcon.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_trophyImage.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_reactionTypeL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_userRankL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_labelGroupL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_contactRecipientL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_paidSubscriptionL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_trophyL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_userOptionL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_userOptionCategoryL10n.php</instruction>
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_captchaQuestionL10n.php</instruction>
Expand Down
29 changes: 29 additions & 0 deletions com.woltlab.wcf/templates/shared_trophyBadgeFormField.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<div class="badgeIconEditor" id="{$field->getPrefixedId()}_container">
<span class="trophyIcon" style="color: {$field->getIconColor()}; background-color: {$field->getBadgeColor()}">
{unsafe:$field->getIcon()->toHtml(64)}
</span>
{if !$field->isImmutable()}
<div class="badgeIconEditorButtons">
<button type="button" class="button small" data-value="icon">{lang}wcf.global.fontAwesome.selectIcon{/lang}</button>
<button type="button" class="button small" data-value="color">{lang}wcf.style.colorPicker.changeColor{/lang}</button>
<button type="button" class="button small" data-value="background-color">{lang}wcf.style.colorPicker.changeBackgroundColor{/lang}</button>
</div>
{/if}
</div>

<input type="hidden" id="{$field->getPrefixedId()}_iconName" name="{$field->getPrefixedId()}[iconName]" value="{$field->getIconName()}">
<input type="hidden" id="{$field->getPrefixedId()}_iconColor" name="{$field->getPrefixedId()}[iconColor]" value="{$field->getIconColor()}">
<input type="hidden" id="{$field->getPrefixedId()}_badgeColor" name="{$field->getPrefixedId()}[badgeColor]" value="{$field->getBadgeColor()}">

{if !$field->isImmutable()}
{if $__trophyBadgeFormFieldIncludeJavaScript}
{include file='shared_fontAwesomeJavaScript'}
{include file='shared_colorPickerJavaScript'}
{/if}

<script data-relocate="true">
require(['WoltLabSuite/Core/Form/Builder/Field/Controller/TrophyBadge'], ({ setup }) => {
setup('{unsafe:$field->getPrefixedId()|encodeJS}');
});
</script>
{/if}
2 changes: 1 addition & 1 deletion com.woltlab.wcf/templates/shared_trophyImage.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<img
src="{$__wcf->getPath()}images/trophy/{$trophy->iconFile}"
src="{$trophy->getIconPath()}"
width="{$size}"
height="{$size}"
{if $showTooltip}title="{$trophy->getTitle()}"{/if}
Expand Down
36 changes: 0 additions & 36 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,18 +150,6 @@ parameters:
count: 2
path: wcfsetup/install/files/lib/acp/form/StyleImportForm.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
count: 4
path: wcfsetup/install/files/lib/acp/form/TrophyAddForm.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
count: 4
path: wcfsetup/install/files/lib/acp/form/TrophyEditForm.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
Expand Down Expand Up @@ -588,12 +576,6 @@ parameters:
count: 2
path: wcfsetup/install/files/lib/data/tag/TagAction.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
count: 1
path: wcfsetup/install/files/lib/data/trophy/TrophyAction.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
Expand Down Expand Up @@ -2412,12 +2394,6 @@ parameters:
count: 1
path: wcfsetup/install/files/lib/system/page/PageLocationManager.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
count: 1
path: wcfsetup/install/files/lib/system/page/handler/TrophyPageHandler.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
Expand All @@ -2430,18 +2406,6 @@ parameters:
count: 1
path: wcfsetup/install/files/lib/system/reaction/ReactionHandler.class.php

-
message: '#^Call to function in_array\(\) requires parameter \#3 to be set\.$#'
identifier: function.strict
count: 1
path: wcfsetup/install/files/lib/system/registry/RegistryHandler.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
count: 1
path: wcfsetup/install/files/lib/system/registry/RegistryHandler.class.php

-
message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
identifier: empty.notAllowed
Expand Down
79 changes: 0 additions & 79 deletions ts/WoltLabSuite/Core/Acp/Ui/Trophy/Badge.ts
View file
Open in desktop

This file was deleted.

Loading
Loading