Changed "reputation" into "reactions"

diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 138f01e52585730f8fc501688885d0d9d0d19b35..d0da57fbcd3ea727d3328a09108c9d8f4d189c36 100644 (file)
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -673,12 +673,6 @@
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
                </type>
-               <type>
-                       <name>com.woltlab.wcf.userReputation</name>
-                       <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
-                       <classname>wcf\system\condition\UserReputationCondition</classname>
-                       <conditiongroup>contents</conditiongroup>
-               </type>
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.userGroupAssignment</definitionname>
@@ -765,12 +759,6 @@
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
                </type>
-               <type>
-                       <name>com.woltlab.wcf.userReputation</name>
-                       <definitionname>com.woltlab.wcf.condition.trophy</definitionname>
-                       <classname>wcf\system\condition\UserReputationCondition</classname>
-                       <conditiongroup>contents</conditiongroup>
-               </type>
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.trophy</definitionname>
@@ -900,13 +888,6 @@
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
                </type>
-               <type>
-                       <name>com.woltlab.wcf.userReputation</name>
-                       <definitionname>com.woltlab.wcf.condition.notice</definitionname>
-                       <classname>wcf\system\condition\UserReputationCondition</classname>
-                       <conditionobject>com.woltlab.wcf.user</conditionobject>
-                       <conditiongroup>contents</conditiongroup>
-               </type>
                <type>
                        <name>com.woltlab.wcf.user.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.notice</definitionname>
@@ -1106,13 +1087,6 @@
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
                </type>
-               <type>
-                       <name>com.woltlab.wcf.userReputation</name>
-                       <definitionname>com.woltlab.wcf.condition.ad</definitionname>
-                       <classname>wcf\system\condition\UserReputationCondition</classname>
-                       <conditionobject>com.woltlab.wcf.user</conditionobject>
-                       <conditiongroup>contents</conditiongroup>
-               </type>
                <type>
                        <name>com.woltlab.wcf.user.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.ad</definitionname>
@@ -1315,12 +1289,6 @@
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
                </type>
-               <type>
-                       <name>com.woltlab.wcf.userReputation</name>
-                       <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
-                       <classname>wcf\system\condition\UserReputationCondition</classname>
-                       <conditiongroup>contents</conditiongroup>
-               </type>
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.bulkProcessing.user.condition</definitionname>
@@ -1413,12 +1381,6 @@
                        <propertyname>likesReceived</propertyname>
                        <minvalue>0</minvalue>
                </type>
-               <type>
-                       <name>com.woltlab.wcf.userReputation</name>
-                       <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>
-                       <classname>wcf\system\condition\UserReputationCondition</classname>
-                       <conditiongroup>contents</conditiongroup>
-               </type>
                <type>
                        <name>com.woltlab.wcf.userOptions</name>
                        <definitionname>com.woltlab.wcf.condition.userSearch</definitionname>

diff --git a/wcfsetup/install/files/lib/page/MembersListPage.class.php b/wcfsetup/install/files/lib/page/MembersListPage.class.php
index da08ea6ebdbf3fe7cb0494398027b1d2c478e179..183bed83b79ced3d7e0c911dc69414b3c77a4339 100644 (file)
--- a/wcfsetup/install/files/lib/page/MembersListPage.class.php
+++ b/wcfsetup/install/files/lib/page/MembersListPage.class.php
@@ -54,7 +54,7 @@ class MembersListPage extends SortablePage {
        /**
         * @inheritDoc
         */
-       public $validSortFields = ['username', 'registrationDate', 'activityPoints', 'reactionReputation', 'lastActivityTime'];
+       public $validSortFields = ['username', 'registrationDate', 'activityPoints', 'likesReceived', 'lastActivityTime'];
        
        /**
         * @inheritDoc
@@ -133,10 +133,6 @@ class MembersListPage extends SortablePage {
         * @inheritDoc
         */
        protected function readObjects() {
-               if ($this->sortField === 'reactionReputation') {
-                       $this->sqlOrderBy = 'user_table.likesReceived '. $this->sortOrder;
-               }
-               
                parent::readObjects();
                
                $userIDs = [];

diff --git a/wcfsetup/install/files/lib/system/condition/UserReputationCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserReputationCondition.class.php
deleted file mode 100644 (file)
index 0fad8b6..0000000
--- a/wcfsetup/install/files/lib/system/condition/UserReputationCondition.class.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-namespace wcf\system\condition;
-use wcf\data\condition\Condition;
-use wcf\data\user\User;
-use wcf\data\user\UserList;
-use wcf\data\DatabaseObjectList;
-use wcf\system\WCF;
-
-/**
- * Condition implementation for the user reputation of an user.
- *
- * @author      Joshua Ruesweg
- * @copyright  2001-2019 WoltLab GmbH
- * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package     WoltLabSuite\Core\System\Condition
- */
-class UserReputationCondition extends AbstractIntegerCondition implements IContentCondition, IObjectListCondition, IUserCondition {
-       use TObjectListUserCondition;
-       
-       /**
-        * @inheritDoc
-        */
-       public function addObjectListCondition(DatabaseObjectList $objectList, array $conditionData) {
-               if (!($objectList instanceof UserList)) {
-                       throw new \InvalidArgumentException("Object list is no instance of '".UserList::class."', instance of '".get_class($objectList)."' given.");
-               }
-               
-               if (isset($conditionData['greaterThan'])) {
-                       /** @noinspection PhpUndefinedFieldInspection */
-                       $objectList->getConditionBuilder()->add('user_table.likesReceived > ?', [$conditionData['greaterThan']]);
-               }
-               if (isset($conditionData['lessThan'])) {
-                       $objectList->getConditionBuilder()->add('user_table.likesReceived < ?', [$conditionData['lessThan']]);
-               }
-       }
-       
-       /**
-        * @inheritDoc
-        */
-       public function checkUser(Condition $condition, User $user) {
-               if ($condition->greaterThan !== null && $user->likesReceived <= $condition->greaterThan) {
-                       return false;
-               }
-               if ($condition->lessThan !== null && $user->likesReceived >= $condition->lessThan) {
-                       return false;
-               }
-               
-               return true;
-       }
-       
-       /**
-        * @inheritDoc
-        */
-       protected function getIdentifier() {
-               return 'user_userReputation';
-       }
-       
-       /**
-        * @inheritDoc
-        */
-       protected function getLabel() {
-               return WCF::getLanguage()->get('wcf.user.condition.userReputation');
-       }
-       
-       /**
-        * @inheritDoc
-        */
-       public function showContent(Condition $condition) {
-               if (!WCF::getUser()->userID) return false;
-               
-               return $this->checkUser($condition, WCF::getUser());
-       }
-}

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index e0dd805a6f8ed9c6501fe75df620915c02fd5845..8958360f388f07eb373c421d20fd47cafb0c4c6c 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -1511,7 +1511,7 @@ Das Fehlerprotokoll enthält {$data[count]} neue Einträge. Die ersten drei, in
                <item name="wcf.acp.option.module_user_profile_wall"><![CDATA[Benutzerprofil-Pinnwand]]></item>
                <item name="wcf.acp.option.category.message.sidebar"><![CDATA[Seitenleiste]]></item>
                <item name="wcf.acp.option.message_sidebar_enable_online_status"><![CDATA[Online-Status der Autoren anzeigen]]></item>
-               <item name="wcf.acp.option.message_sidebar_enable_likes_received"><![CDATA[Reputation der Autoren anzeigen]]></item>
+               <item name="wcf.acp.option.message_sidebar_enable_likes_received"><![CDATA[Erhaltene Reaktionen der Autoren anzeigen]]></item>
                <item name="wcf.acp.option.message_sidebar_enable_activity_points"><![CDATA[Aktivitätspunkte der Autoren anzeigen]]></item>
                <item name="wcf.acp.option.message_sidebar_enable_trophy_points"><![CDATA[Anzahl der Trophäen der Autoren anzeigen]]></item>
                <item name="wcf.acp.option.message_sidebar_user_options"><![CDATA[Ausgewählte Profilfelder der Autoren anzeigen]]></item>
@@ -3977,7 +3977,6 @@ Dateianhänge:
                <item name="wcf.like.reaction.noMoreEntries"><![CDATA[Keine weiteren Reaktionen]]></item>
                <item name="wcf.like.reactionsReceived"><![CDATA[Erhaltene Reaktionen]]></item>
                <item name="wcf.like.reactionsGiven"><![CDATA[Vergebene Reaktionen]]></item>
-               <item name="wcf.like.reactionReputation"><![CDATA[Reputation aus Reaktionen]]></item>
        </category>
        <category name="wcf.map">
                <item name="wcf.map.noLocationSuggestions"><![CDATA[Für den aktuellen Kartenausschnitt liegen keine Ortsvorschläge vor.]]></item>
@@ -4618,11 +4617,10 @@ sich{/if} nicht bei uns registriert {if LANGUAGE_USE_INFORMAL_VARIANT}hast{else}
                <item name="wcf.user.boxList.description.registrationDate"><![CDATA[{@$boxUser->registrationDate|time}]]></item>
                <item name="wcf.user.mostOnlineUsers"><![CDATA[Meiste Benutzer online]]></item>
                <item name="wcf.user.sortField.activityPoints"><![CDATA[Punkte]]></item>
-               <item name="wcf.user.sortField.likesReceived"><![CDATA[Erhaltene Likes]]></item>
+               <item name="wcf.user.sortField.likesReceived"><![CDATA[Erhaltene Reaktionen]]></item>
                <item name="wcf.user.sortField.registrationDate"><![CDATA[Registrierungsdatum]]></item>
                <item name="wcf.user.sortField.username"><![CDATA[Benutzername]]></item>
                <item name="wcf.user.sortField.lastActivityTime"><![CDATA[Letzte Aktivität]]></item>
-               <item name="wcf.user.sortField.reactionReputation"><![CDATA[Reputation aus Reaktionen]]></item>
                <item name="wcf.user.articles"><![CDATA[Artikel]]></item>
                <item name="wcf.user.status.banned"><![CDATA[Der Benutzer ist gesperrt.]]></item>
                <item name="wcf.user.status.isDisabled"><![CDATA[Der Benutzer ist nicht freigeschaltet.]]></item>
@@ -4875,7 +4873,7 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}
                <item name="wcf.user.condition.groupIDs.description"><![CDATA[Benutzer müssen in allen ausgewählten Benutzergruppen Mitglied sein.]]></item>
                <item name="wcf.user.condition.languages"><![CDATA[Sprachen]]></item>
                <item name="wcf.user.condition.lastActivityTime"><![CDATA[Letzte Aktivität]]></item>
-               <item name="wcf.user.condition.likesReceived"><![CDATA[Positive Reaktionen]]></item>
+               <item name="wcf.user.condition.likesReceived"><![CDATA[Erhaltene Reaktionen]]></item>
                <item name="wcf.user.condition.mobileBrowser"><![CDATA[Mobiler Browser]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser"><![CDATA[Verwendet mobilen Browser]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser.error.conflict"><![CDATA[„Verwendet mobilen Browser“ und „Verwendet keinen mobilen Browser“ können nicht gleichzeitig ausgewählt werden.]]></item>
@@ -4898,7 +4896,6 @@ Die E-Mail-Adresse des neuen Benutzers lautet: {@$user->email}
                <item name="wcf.user.condition.notUserTrophyIDs.description"><![CDATA[Benutzer dürfen keine der ausgewählten Trophäen erhalten haben.]]></item>
                <item name="wcf.user.condition.notUserTrophyIDs.error.userTrophyIntersection"><![CDATA[Die ausgewählten Trophäen in „hat Trophäe“ und „hat nicht Trophäe“ sind widersprüchlich.]]></item>
                <item name="wcf.user.condition.trophyPoints"><![CDATA[Trophäen]]></item>
-               <item name="wcf.user.condition.userReputation"><![CDATA[Reputation aus Reaktionen]]></item>
        </category>
        <category name="wcf.user.coverPhoto">
                <item name="wcf.user.coverPhoto"><![CDATA[Titelbild]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index c9da212a617a46357a11a2dd111253a64969f844..f773393c8a7c987246f627b136204467a7e9b9cb 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -3895,7 +3895,7 @@ Attachments:
                <item name="wcf.like.jsTooltip"><![CDATA[{literal}{if $likes}{#$likes} Like{if $likes != 1}s{/if}{if $dislikes}, {/if}{/if}{if $dislikes}{#$dislikes} Dislike{if $dislikes != 1}s{/if}{/if}{/literal}]]></item>
                <item name="wcf.like.button.like"><![CDATA[Like]]></item>
                <item name="wcf.like.button.dislike"><![CDATA[Dislike]]></item>
-               <item name="wcf.like.likesReceived"><![CDATA[Reputation]]></item>
+               <item name="wcf.like.likesReceived"><![CDATA[Reactions Received]]></item>
                <item name="wcf.like.showLikesReceived"><![CDATA[Reactions Received by {$user->username}]]></item>
                <item name="wcf.like.likesGiven"><![CDATA[Likes Given]]></item>
                <item name="wcf.like.dislikesReceived"><![CDATA[Dislikes Received]]></item>
@@ -3923,7 +3923,6 @@ Attachments:
                <item name="wcf.like.reaction.noMoreEntries"><![CDATA[There are not any new reactions at the moment.]]></item>
                <item name="wcf.like.reactionsReceived"><![CDATA[Reactions Received]]></item>
                <item name="wcf.like.reactionsGiven"><![CDATA[Reactions Given]]></item>
-               <item name="wcf.like.reactionReputation"><![CDATA[Reputation from Reactions]]></item>
        </category>
        <category name="wcf.map">
                <item name="wcf.map.noLocationSuggestions"><![CDATA[There are no location suggestions in the current map section.]]></item>
@@ -4615,11 +4614,10 @@ not register with us.]]></item>
                <item name="wcf.user.boxList.description.registrationDate"><![CDATA[{@$boxUser->registrationDate|time}]]></item>
                <item name="wcf.user.mostOnlineUsers"><![CDATA[Most Online Users]]></item>
                <item name="wcf.user.sortField.activityPoints"><![CDATA[Points]]></item>
-               <item name="wcf.user.sortField.likesReceived"><![CDATA[Likes Received]]></item>
+               <item name="wcf.user.sortField.likesReceived"><![CDATA[Reactions Received]]></item>
                <item name="wcf.user.sortField.registrationDate"><![CDATA[Registration Date]]></item>
                <item name="wcf.user.sortField.username"><![CDATA[Username]]></item>
                <item name="wcf.user.sortField.lastActivityTime"><![CDATA[Last Activity]]></item>
-               <item name="wcf.user.sortField.reactionReputation"><![CDATA[Reputation from Reactions]]></item>
                <item name="wcf.user.articles"><![CDATA[Articles]]></item>
                <item name="wcf.user.status.banned"><![CDATA[The user has been banned.]]></item>
                <item name="wcf.user.status.isDisabled"><![CDATA[The user has not been approved yet.]]></item>
@@ -4871,7 +4869,7 @@ Open the link below to access the user profile:
                <item name="wcf.user.condition.groupIDs.description"><![CDATA[User is a member of the selected user group(s).]]></item>
                <item name="wcf.user.condition.languages"><![CDATA[Language(s)]]></item>
                <item name="wcf.user.condition.lastActivityTime"><![CDATA[Last Activity]]></item>
-               <item name="wcf.user.condition.likesReceived"><![CDATA[Positive Reactions]]></item>
+               <item name="wcf.user.condition.likesReceived"><![CDATA[Reactions Received]]></item>
                <item name="wcf.user.condition.mobileBrowser"><![CDATA[Mobile Device or Desktop]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser"><![CDATA[Uses mobile device]]></item>
                <item name="wcf.user.condition.mobileBrowser.usesMobileBrowser.error.conflict"><![CDATA[You cannot simultaneously select “Uses mobile device” and “Uses desktop”.]]></item>
@@ -4894,7 +4892,6 @@ Open the link below to access the user profile:
                <item name="wcf.user.condition.notUserTrophyIDs.description"><![CDATA[User has not received the selected trophies.]]></item>
                <item name="wcf.user.condition.notUserTrophyIDs.error.userTrophyIntersection"><![CDATA[The selected trophies in “User has Trophy” and “User does not have Trophy” are conflicting.]]></item>
                <item name="wcf.user.condition.trophyPoints"><![CDATA[Trophies]]></item>
-               <item name="wcf.user.condition.userReputation"><![CDATA[Reputation from Reactions]]></item>
        </category>
        <category name="wcf.user.coverPhoto">
                <item name="wcf.user.coverPhoto"><![CDATA[Cover Photo]]></item>