diff --git a/acptemplates/__minecraftUserAddSection.tpl b/acptemplates/__minecraftUserAddSection.tpl index 9619f6a..db306be 100644 --- a/acptemplates/__minecraftUserAddSection.tpl +++ b/acptemplates/__minecraftUserAddSection.tpl @@ -3,11 +3,11 @@

{lang}wcf.page.userAddSection.minecraft.sectionTitle{/lang}

- {lang}wcf.page.userAddSection.minecraft.add{/lang}

+ {lang}wcf.page.userAddSection.minecraft.add{/lang}

- {if $minecrafts|count > 0} + {if $minecraftUsers|count > 0}
- +
@@ -18,15 +18,15 @@ - {foreach from=$minecrafts item=minecraft} - + {foreach from=$minecraftUsers item=minecraftUser} + - - - - + + + + {/foreach} diff --git a/acptemplates/minecraftIDAdd.tpl b/acptemplates/minecraftUserAdd.tpl similarity index 70% rename from acptemplates/minecraftIDAdd.tpl rename to acptemplates/minecraftUserAdd.tpl index d1027db..deafb47 100644 --- a/acptemplates/minecraftIDAdd.tpl +++ b/acptemplates/minecraftUserAdd.tpl @@ -2,11 +2,11 @@
-

{lang}wcf.page.minecraftIDAddACP.pageTitle{/lang}

+

{lang}wcf.page.minecraftUserAddACP.pageTitle{/lang}

diff --git a/files/acp/install_de.xxschrandxx.wsc.minecraft-linker_1.0.0.php b/files/acp/install_de.xxschrandxx.wsc.minecraft-linker.php similarity index 79% rename from files/acp/install_de.xxschrandxx.wsc.minecraft-linker_1.0.0.php rename to files/acp/install_de.xxschrandxx.wsc.minecraft-linker.php index 646b715..0f29764 100644 --- a/files/acp/install_de.xxschrandxx.wsc.minecraft-linker_1.0.0.php +++ b/files/acp/install_de.xxschrandxx.wsc.minecraft-linker.php @@ -6,19 +6,21 @@ use wcf\system\database\table\column\VarcharDatabaseTableColumn; use wcf\system\database\table\DatabaseTable; use wcf\system\database\table\DatabaseTableChangeProcessor; +use wcf\system\database\table\PartialDatabaseTable; use wcf\system\database\table\index\DatabaseTableForeignKey; +use wcf\system\database\table\index\DatabaseTablePrimaryIndex; use wcf\system\WCF; $tables = [ // wcf1_user - DatabaseTable::create('wcf1_user') + PartialDatabaseTable::create('wcf1_user') ->columns([ NotNullInt10DatabaseTableColumn::create('minecraftUUIDs') ->defaultValue(0), ]), // wcf1_user_group - DatabaseTable::create('wcf1_user_group') + PartialDatabaseTable::create('wcf1_user_group') ->columns([ BlobDatabaseTableColumn::create('minecraftGroupNames'), ]), @@ -26,7 +28,7 @@ // wcf1_user_minecraft DatabaseTable::create('wcf1_user_minecraft') ->columns([ - NotNullInt10DatabaseTableColumn::create('minecraftID') + NotNullInt10DatabaseTableColumn::create('minecraftUserID') ->autoIncrement(), NotNullInt10DatabaseTableColumn::create('userID'), VarcharDatabaseTableColumn::create('minecraftUUID') @@ -42,6 +44,10 @@ ->onDelete('CASCADE') ->referencedColumns(['userID']) ->referencedTable('wcf1_user'), + ]) + ->indices([ + DatabaseTablePrimaryIndex::create() + ->columns(['minecraftUserID']), ]), ]; diff --git a/files/lib/acp/form/MinecraftIDAddForm.class.php b/files/lib/acp/form/MinecraftUserAddForm.class.php similarity index 77% rename from files/lib/acp/form/MinecraftIDAddForm.class.php rename to files/lib/acp/form/MinecraftUserAddForm.class.php index 4a1765e..0a45893 100644 --- a/files/lib/acp/form/MinecraftIDAddForm.class.php +++ b/files/lib/acp/form/MinecraftUserAddForm.class.php @@ -3,8 +3,8 @@ namespace wcf\acp\form; use wcf\data\user\User; -use wcf\data\user\minecraft\MinecraftAction; -use wcf\data\user\minecraft\MinecraftList; +use wcf\data\user\minecraft\MinecraftUserAction; +use wcf\data\user\minecraft\MinecraftUserList; use wcf\form\AbstractFormBuilderForm; use wcf\system\exception\IllegalLinkException; use wcf\system\form\builder\container\FormContainer; @@ -16,7 +16,7 @@ use wcf\system\minecraft\MinecraftLinkerHandler; use wcf\system\WCF; -class MinecraftIDAddForm extends AbstractFormBuilderForm +class MinecraftUserAddForm extends AbstractFormBuilderForm { /** * @inheritDoc @@ -36,7 +36,7 @@ class MinecraftIDAddForm extends AbstractFormBuilderForm /** * @inheritDoc */ - public $objectActionClass = MinecraftAction::class; + public $objectActionClass = MinecraftUserAction::class; /** * Benutzer-Objekt @@ -93,8 +93,8 @@ public function createForm() $fields = [ TextFormField::create('title') ->required() - ->label('wcf.page.minecraftIDAddACP.title') - ->description('wcf.page.minecraftIDAddACP.title.description') + ->label('wcf.page.minecraftUserAddACP.title') + ->description('wcf.page.minecraftUserAddACP.title.description') ->maximumLength(30) ->value('Default') ]; @@ -102,31 +102,31 @@ public function createForm() if (empty($options)) { $minecraftUUIDField = TextFormField::create('minecraftUUID') ->required() - ->label('wcf.page.minecraftIDAddACP.minecraftUUID') - ->description('wcf.page.minecraftIDAddACP.minecraftUUID.description') + ->label('wcf.page.minecraftUserAddACP.minecraftUUID') + ->description('wcf.page.minecraftUserAddACP.minecraftUUID.description') ->minimumLength(36) ->maximumLength(36) ->addValidator(new FormFieldValidator('checkMinecraftUser', function (TextFormField $field) { - $minecraftList = new MinecraftList(); - $minecraftList->getConditionBuilder()->add('minecraftUUID = ?', [$field->getValue()]); - $minecraftList->readObjects(); - if (count($minecraftList)) { + $minecraftUserList = new MinecraftUserList(); + $minecraftUserList->getConditionBuilder()->add('minecraftUUID = ?', [$field->getValue()]); + $minecraftUserList->readObjects(); + if (count($minecraftUserList)) { $field->addValidationError( - new FormFieldValidationError('alreadyUsed', 'wcf.page.minecraftIDAddACP.minecraftUUID.error.alreadyUsed') + new FormFieldValidationError('alreadyUsed', 'wcf.page.minecraftUserAddACP.minecraftUUID.error.alreadyUsed') ); } })); } else { $minecraftUUIDField = SingleSelectionFormField::create('minecraftUUID') ->required() - ->label('wcf.page.minecraftIDAddACP.minecraftUUID') + ->label('wcf.page.minecraftUserAddACP.minecraftUUID') ->options($options, true, false) ->filterable() ->addValidator(new FormFieldValidator('checkMinecraftUser', function (SingleSelectionFormField $field) { - $minecraftList = new MinecraftList(); - $minecraftList->getConditionBuilder()->add('minecraftUUID = ?', [$field->getValue()]); - $minecraftList->readObjects(); - if (count($minecraftList)) { + $minecraftUserList = new MinecraftUserList(); + $minecraftUserList->getConditionBuilder()->add('minecraftUUID = ?', [$field->getValue()]); + $minecraftUserList->readObjects(); + if (count($minecraftUserList)) { $field->addValidationError( new FormFieldValidationError('empty') ); diff --git a/files/lib/data/user/minecraft/Minecraft.class.php b/files/lib/data/user/minecraft/MinecraftUser.class.php similarity index 76% rename from files/lib/data/user/minecraft/Minecraft.class.php rename to files/lib/data/user/minecraft/MinecraftUser.class.php index 012f53a..755ef43 100644 --- a/files/lib/data/user/minecraft/Minecraft.class.php +++ b/files/lib/data/user/minecraft/MinecraftUser.class.php @@ -8,12 +8,12 @@ use wcf\system\minecraft\MinecraftConnectionHandler; /** - * Minecraft Data class + * MinecraftUser Data class * * @author xXSchrandXx * @package WoltLabSuite\Core\Data\User\Minecraft */ -class Minecraft extends DatabaseObject +class MinecraftUser extends DatabaseObject { /** * @inheritDoc @@ -23,5 +23,5 @@ class Minecraft extends DatabaseObject /** * @inheritDoc */ - protected static $databaseTableIndexName = 'minecraftID'; + protected static $databaseTableIndexName = 'minecraftUserID'; } diff --git a/files/lib/data/user/minecraft/MinecraftAction.class.php b/files/lib/data/user/minecraft/MinecraftUserAction.class.php similarity index 76% rename from files/lib/data/user/minecraft/MinecraftAction.class.php rename to files/lib/data/user/minecraft/MinecraftUserAction.class.php index 176c3f1..1002a59 100644 --- a/files/lib/data/user/minecraft/MinecraftAction.class.php +++ b/files/lib/data/user/minecraft/MinecraftUserAction.class.php @@ -5,17 +5,16 @@ use wcf\data\user\User; use wcf\data\user\UserEditor; use wcf\data\AbstractDatabaseObjectAction; -use wcf\data\user\minecraft\MinecraftList; use wcf\system\event\EventHandler; use wcf\system\WCF; /** - * Minecraft Action class + * MinecraftUser Action class * * @author xXSchrandXx * @package WoltLabSuite\Core\Data\User\Minecraft */ -class MinecraftAction extends AbstractDatabaseObjectAction +class MinecraftUserAction extends AbstractDatabaseObjectAction { /** * @inheritDoc @@ -56,11 +55,11 @@ public function delete() */ public function updateUUIDAmount($userID) { - $minecraftList = new MinecraftList(); - $minecraftList->getConditionBuilder()->add('userID = ?', [$userID]); - $minecraftList->readObjects(); + $minecraftUserList = new MinecraftUserList(); + $minecraftUserList->getConditionBuilder()->add('userID = ?', [$userID]); + $minecraftUserList->readObjects(); $editor = new UserEditor(new User($userID)); - $editor->update(['minecraftUUIDs' => count($minecraftList)]); + $editor->update(['minecraftUUIDs' => count($minecraftUserList)]); } } diff --git a/files/lib/data/user/minecraft/MinecraftEditor.class.php b/files/lib/data/user/minecraft/MinecraftUserEditor.class.php similarity index 59% rename from files/lib/data/user/minecraft/MinecraftEditor.class.php rename to files/lib/data/user/minecraft/MinecraftUserEditor.class.php index d58cc17..144b3b6 100644 --- a/files/lib/data/user/minecraft/MinecraftEditor.class.php +++ b/files/lib/data/user/minecraft/MinecraftUserEditor.class.php @@ -5,15 +5,15 @@ use wcf\data\DatabaseObjectEditor; /** - * Minecraft Editor class + * MinecraftUser Editor class * * @author xXSchrandXx * @package WoltLabSuite\Core\Data\User\Minecraft */ -class MinecraftEditor extends DatabaseObjectEditor +class MinecraftUserEditor extends DatabaseObjectEditor { /** * @inheritDoc */ - protected static $baseClass = Minecraft::class; + protected static $baseClass = MinecraftUser::class; } diff --git a/files/lib/data/user/minecraft/MinecraftList.class.php b/files/lib/data/user/minecraft/MinecraftUserList.class.php similarity index 68% rename from files/lib/data/user/minecraft/MinecraftList.class.php rename to files/lib/data/user/minecraft/MinecraftUserList.class.php index 2b7e9dd..04f9a0b 100644 --- a/files/lib/data/user/minecraft/MinecraftList.class.php +++ b/files/lib/data/user/minecraft/MinecraftUserList.class.php @@ -5,12 +5,12 @@ use wcf\data\DatabaseObjectList; /** - * Minecraft List class + * MinecraftUser List class * * @author xXSchrandXx * @package WoltLabSuite\Core\Data\User\Minecraft */ -class MinecraftList extends DatabaseObjectList +class MinecraftUserList extends DatabaseObjectList { } diff --git a/files/lib/form/MinecraftIDAddForm.class.php b/files/lib/form/MinecraftUserAddForm.class.php similarity index 82% rename from files/lib/form/MinecraftIDAddForm.class.php rename to files/lib/form/MinecraftUserAddForm.class.php index 7a4e825..171aed7 100644 --- a/files/lib/form/MinecraftIDAddForm.class.php +++ b/files/lib/form/MinecraftUserAddForm.class.php @@ -2,7 +2,6 @@ namespace wcf\form; -use wcf\data\user\minecraft\MinecraftAction; use wcf\system\exception\IllegalLinkException; use wcf\system\exception\MinecraftException; use wcf\system\exception\UserInputException; @@ -17,7 +16,7 @@ use wcf\system\WCF; use wcf\util\HeaderUtil; -class MinecraftIDAddForm extends AbstractFormBuilderForm +class MinecraftUserAddForm extends AbstractFormBuilderForm { /** * @inheritDoc @@ -32,7 +31,7 @@ class MinecraftIDAddForm extends AbstractFormBuilderForm /** * @inheritDoc */ - public $activeMenuItem = 'wcf.user.menu.minecraftSection.minecraftIDList'; + public $activeMenuItem = 'wcf.user.menu.minecraftSection.minecraftUserList'; /** * @inheritDoc @@ -69,7 +68,8 @@ public function readParameters() parent::readParameters(); if (MINECRAFT_MAX_UUIDS == 0 || MINECRAFT_MAX_UUIDS <= WCF::getUser()->minecraftUUIDs) { - throw new IllegalLinkException(); + HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftUserList'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftUserAdd.error.maxReached'), 2, 'error'); + exit; } $code = WCF::getSession()->getVar('mcCode'); @@ -77,7 +77,7 @@ public function readParameters() $minecraftUUID = WCF::getSession()->getVar('minecraftUUID'); if (isset($minecraftUUID) && isset($code) && isset($title)) { - HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftIDCheck'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftIDAdd.alreadySend'), 2, 'error'); + HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftUserCheck'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftUserAdd.error.alreadySend'), 2, 'error'); exit; } } @@ -91,7 +91,7 @@ public function createForm() $unknownUsers = $this->mcsh->getUnknownMinecraftUsers(); if (empty($unknownUsers)) { - HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftIDList'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftIDAdd.error.noUnknownUsers'), 5, 'error'); + HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftUserList'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftUserAdd.error.noUnknownUsers'), 5, 'error'); exit; } @@ -107,8 +107,8 @@ public function createForm() if (MINECRAFT_MAX_UUIDS > 1) { $titleField = TextFormField::create('title') ->required() - ->label('wcf.page.minecraftIDAdd.title') - ->description('wcf.page.minecraftIDAdd.title.description') + ->label('wcf.page.minecraftUserAdd.title') + ->description('wcf.page.minecraftUserAdd.title.description') ->maximumLength(30) ->value('Default'); array_push($fields, $titleField); @@ -116,8 +116,8 @@ public function createForm() $minecraftUUIDField = SingleSelectionFormField::create('minecraftUUID') ->required() - ->label('wcf.page.minecraftIDAdd.uuid') - ->description('wcf.page.minecraftIDAdd.uuid.description') + ->label('wcf.page.minecraftUserAdd.uuid') + ->description('wcf.page.minecraftUserAdd.uuid.description') ->options($options, true, false) ->filterable() ->addValidator(new FormFieldValidator('sendCode', function (SingleSelectionFormField $field) { @@ -132,11 +132,11 @@ public function createForm() if ($response['error'] == true) { if (isset($response['message'])) { $field->addValidationError( - new FormFieldValidationError('sendCode', 'wcf.page.minecraftIDAdd.error.sendCodeDynamic', ['msg' => $response['message']]) + new FormFieldValidationError('sendCode', 'wcf.page.minecraftUserAdd.error.sendCodeDynamic', ['msg' => $response['message']]) ); } else { $field->addValidationError( - new FormFieldValidationError('sendCode', 'wcf.page.minecraftIDAdd.error.sendCode') + new FormFieldValidationError('sendCode', 'wcf.page.minecraftUserAdd.error.sendCode') ); } } @@ -167,7 +167,7 @@ public function saved() { parent::saved(); - HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftIDCheck'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftIDAdd.success'), 2); + HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftUserCheck'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftUserAdd.success'), 2); exit; } diff --git a/files/lib/form/MinecraftIDCheckForm.class.php b/files/lib/form/MinecraftUserCheckForm.class.php similarity index 80% rename from files/lib/form/MinecraftIDCheckForm.class.php rename to files/lib/form/MinecraftUserCheckForm.class.php index 565dd6d..a36cf5c 100644 --- a/files/lib/form/MinecraftIDCheckForm.class.php +++ b/files/lib/form/MinecraftUserCheckForm.class.php @@ -3,8 +3,8 @@ namespace wcf\form; use wcf\data\user\UserAction; -use wcf\data\user\minecraft\MinecraftAction; -use wcf\data\user\minecraft\MinecraftList; +use wcf\data\user\minecraft\MinecraftUserAction; +use wcf\data\user\minecraft\MinecraftUserList; use wcf\system\exception\IllegalLinkException; use wcf\system\form\builder\container\FormContainer; use wcf\system\form\builder\field\TextFormField; @@ -15,7 +15,7 @@ use wcf\system\WCF; use wcf\util\HeaderUtil; -class MinecraftIDCheckForm extends AbstractFormBuilderForm +class MinecraftUserCheckForm extends AbstractFormBuilderForm { /** * @inheritDoc @@ -30,12 +30,12 @@ class MinecraftIDCheckForm extends AbstractFormBuilderForm /** * @inheritDoc */ - public $activeMenuItem = 'wcf.user.menu.minecraftSection.minecraftIDList'; + public $activeMenuItem = 'wcf.user.menu.minecraftSection.minecraftUserList'; /** * @inheritDoc */ - public $objectActionClass = MinecraftAction::class; + public $objectActionClass = MinecraftUserAction::class; /** * @inheritDoc @@ -85,7 +85,7 @@ public function readParameters() WCF::getSession()->unregister('mcTitle'); WCF::getSession()->unregister('minecraftUUID'); - HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftIDAdd'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftIDCheck.resend.success'), 2, 'info'); + HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftUserAdd'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftUserCheck.resend.success'), 2, 'info'); exit; } } @@ -114,20 +114,20 @@ protected function createForm() FormContainer::create('data') ->appendChildren([ TextFormField::create('code')->required() - ->label('wcf.page.minecraftIDCheck.code') - ->description('wcf.page.minecraftIDCheck.code.description') + ->label('wcf.page.minecraftUserCheck.code') + ->description('wcf.page.minecraftUserCheck.code.description') ->addValidator(new FormFieldValidator('minecraftUUIDCheck', function (TextFormField $field) { if (!\hash_equals($this->code, $field->getValue())) { $field->addValidationError( - new FormFieldValidationError('wrongCode', 'wcf.page.minecraftIDCheck.code.error.wrongSecurityCode') + new FormFieldValidationError('wrongCode', 'wcf.page.minecraftUserCheck.code.error.wrongSecurityCode') ); } - $minecraftList = new MinecraftList(); - $minecraftList->getConditionBuilder()->add('minecraftUUID = ?', [$this->minecraftUUID]); - $minecraftList->readObjects(); - if (count($minecraftList) > 0) { + $minecraftUserList = new MinecraftUserList(); + $minecraftUserList->getConditionBuilder()->add('minecraftUUID = ?', [$this->minecraftUUID]); + $minecraftUserList->readObjects(); + if (count($minecraftUserList) > 0) { $field->addValidationError( - new FormFieldValidationError('used', 'wcf.page.minecraftIDCheck.code.error.alreadyUsed') + new FormFieldValidationError('used', 'wcf.page.minecraftUserCheck.code.error.alreadyUsed') ); } })) @@ -166,7 +166,7 @@ public function saved() $this->form->cleanup(); $this->form->showSuccessMessage(true); - HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftIDList'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftIDCheck.success')); + HeaderUtil::delayedRedirect(LinkHandler::getInstance()->getLink('MinecraftUserList'), WCF::getLanguage()->getDynamicVariable('wcf.page.minecraftUserCheck.success')); exit; } diff --git a/files/lib/page/MinecraftIDListPage.class.php b/files/lib/page/MinecraftUserListPage.class.php similarity index 85% rename from files/lib/page/MinecraftIDListPage.class.php rename to files/lib/page/MinecraftUserListPage.class.php index fa23357..f6e2363 100644 --- a/files/lib/page/MinecraftIDListPage.class.php +++ b/files/lib/page/MinecraftUserListPage.class.php @@ -2,12 +2,12 @@ namespace wcf\page; -use wcf\data\user\minecraft\MinecraftList; +use wcf\data\user\minecraft\MinecraftUserList; use wcf\system\exception\IllegalLinkException; use wcf\system\menu\user\UserMenu; use wcf\system\WCF; -class MinecraftIDListPage extends MultipleLinkPage +class MinecraftUserListPage extends MultipleLinkPage { /** * @inheritDoc @@ -27,17 +27,17 @@ class MinecraftIDListPage extends MultipleLinkPage /** * @inheritDoc */ - public $activeMenuItem = 'wcf.user.menu.minecraftSection.minecraftIDList'; + public $activeMenuItem = 'wcf.user.menu.minecraftSection.minecraftUserList'; /** * @inheritDoc */ - public $objectListClassName = MinecraftList::class; + public $objectListClassName = MinecraftUserList::class; /** * @inheritDoc */ - public $sortField = 'minecraftID'; + public $sortField = 'minecraftUserID'; /** * @inheritDoc diff --git a/files/lib/system/condition/MinecraftLinkedCondition.class.php b/files/lib/system/condition/MinecraftLinkedCondition.class.php index 05bb00f..383b436 100644 --- a/files/lib/system/condition/MinecraftLinkedCondition.class.php +++ b/files/lib/system/condition/MinecraftLinkedCondition.class.php @@ -76,14 +76,6 @@ public function setData(Condition $condition) $this->minecraftLinked = $condition->minecraftLinked; } - /** - * @inheritDoc - */ - public function validate() - { - // nothing to validate - } - /** * @inheritDoc */ diff --git a/files/lib/system/event/listener/MinecraftACPUserEditListener.class.php b/files/lib/system/event/listener/MinecraftACPUserEditListener.class.php index 40321af..88fd93f 100644 --- a/files/lib/system/event/listener/MinecraftACPUserEditListener.class.php +++ b/files/lib/system/event/listener/MinecraftACPUserEditListener.class.php @@ -2,7 +2,7 @@ namespace wcf\system\event\listener; -use wcf\data\user\minecraft\MinecraftList; +use wcf\data\user\minecraft\MinecraftUserList; use wcf\system\WCF; class MinecraftACPUserEditListener implements IParameterizedEventListener @@ -27,13 +27,13 @@ public function assignVariables($eventObj) return; } - $minecraftList = new MinecraftList(); - $minecraftList->getConditionBuilder()->add('userID = ?', [$eventObj->userID]); - $minecraftList->readObjects(); - $minecrafts = $minecraftList->getObjects(); + $minecraftUserList = new MinecraftUserList(); + $minecraftUserList->getConditionBuilder()->add('userID = ?', [$eventObj->userID]); + $minecraftUserList->readObjects(); + $minecraftUsers = $minecraftUserList->getObjects(); WCF::getTPL()->assign([ - 'minecrafts' => $minecrafts + 'minecraftUsers' => $minecraftUsers ]); } } diff --git a/files/lib/system/minecraft/AbstractMinecraftLinkerHandler.class.php b/files/lib/system/minecraft/AbstractMinecraftLinkerHandler.class.php index 949e3be..3ba5d9d 100644 --- a/files/lib/system/minecraft/AbstractMinecraftLinkerHandler.class.php +++ b/files/lib/system/minecraft/AbstractMinecraftLinkerHandler.class.php @@ -3,7 +3,6 @@ namespace wcf\system\minecraft; use wcf\data\minecraft\Minecraft; -use wcf\data\user\minecraft\MinecraftList; abstract class AbstractMinecraftLinkerHandler implements IMinecraftLinkerHandler { diff --git a/files/lib/system/minecraft/MinecraftLinkerHandler.class.php b/files/lib/system/minecraft/MinecraftLinkerHandler.class.php index 7649684..1ff3027 100644 --- a/files/lib/system/minecraft/MinecraftLinkerHandler.class.php +++ b/files/lib/system/minecraft/MinecraftLinkerHandler.class.php @@ -4,6 +4,8 @@ use wcf\system\exception\MinecraftException; use wcf\data\minecraft\Minecraft; +use wcf\data\minecraft\MinecraftList; +use wcf\data\user\minecraft\MinecraftUserList; use wcf\system\SingletonFactory; use wcf\util\StringUtil; @@ -36,7 +38,7 @@ public function init() return; } - $minecraftList = new \wcf\data\minecraft\MinecraftList(); + $minecraftList = new MinecraftList(); $minecraftList->setObjectIDs($this->minecraftIDs); $minecraftList->readObjects(); $this->minecrafts = $minecraftList->getObjects(); @@ -162,7 +164,7 @@ public function getUnknownMinecraftUsers() if (empty($allUsers)) { return $this->unknownOnlineMinecraftUsers; } - $savedUsersList = new \wcf\data\user\minecraft\MinecraftList(); + $savedUsersList = new MinecraftUserList(); $savedUsersList->readObjects(); $savedUsers = $savedUsersList->getObjects(); $knownUsers = []; @@ -203,7 +205,7 @@ public function getKnownMinecraftUsers() if (empty($allUsers)) { return $this->knownOnlineMinecraftUsers; } - $savedUsersList = new \wcf\data\user\minecraft\MinecraftList(); + $savedUsersList = new MinecraftUserList(); $savedUsersList->readObjects(); $savedUsers = $savedUsersList->getObjects(); $knownUsers = []; diff --git a/language/de.xml b/language/de.xml index 71a7eed..e7e5cd3 100644 --- a/language/de.xml +++ b/language/de.xml @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + @@ -43,32 +43,33 @@ - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + @@ -79,6 +80,6 @@ - + diff --git a/language/en.xml b/language/en.xml index 97f49b8..2b2ae41 100644 --- a/language/en.xml +++ b/language/en.xml @@ -22,14 +22,14 @@ - - - - - - - - + + + + + + + + @@ -43,32 +43,33 @@ - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + @@ -79,6 +80,6 @@ - + diff --git a/package.xml b/package.xml index beab0c7..50e0b85 100644 --- a/package.xml +++ b/package.xml @@ -33,10 +33,7 @@ - acp/install_de.xxschrandxx.wsc.minecraft-linker_1.0.0.php + acp/install_de.xxschrandxx.wsc.minecraft-linker.php - - - diff --git a/page.xml b/page.xml index 7b4e95c..71b067e 100644 --- a/page.xml +++ b/page.xml @@ -1,14 +1,13 @@ - + system - wcf\page\MinecraftIDListPage + wcf\page\MinecraftUserListPage Minecraft-Identitäten Minecraft Identities user.minecraftLinker.canManage MINECRAFT_LINKER_ENABLED,MINECRAFT_LINKER_IDENTITY - Minecraft Identities @@ -16,14 +15,13 @@ Minecraft-Identitäten - + system - wcf\form\MinecraftIDAddForm + wcf\form\MinecraftUserAddForm Minecraft-Identität hinzufügen Add Minecraft Identity user.minecraftLinker.canManage MINECRAFT_LINKER_ENABLED,MINECRAFT_LINKER_IDENTITY - Add Minecraft Identity @@ -31,14 +29,13 @@ Minecraft-Identität hinzufügen - + system - wcf\form\MinecraftIDCheckForm + wcf\form\MinecraftUserCheckForm Minecraft-Identität bestätigen Confirm Minecraft Identity user.minecraftLinker.canManage MINECRAFT_LINKER_ENABLED,MINECRAFT_LINKER_IDENTITY - Confirm Minecraft Identity diff --git a/templates/minecraftIDAdd.tpl b/templates/minecraftUserAdd.tpl similarity index 100% rename from templates/minecraftIDAdd.tpl rename to templates/minecraftUserAdd.tpl diff --git a/templates/minecraftIDCheck.tpl b/templates/minecraftUserCheck.tpl similarity index 61% rename from templates/minecraftIDCheck.tpl rename to templates/minecraftUserCheck.tpl index 1641814..427f789 100644 --- a/templates/minecraftIDCheck.tpl +++ b/templates/minecraftUserCheck.tpl @@ -1,7 +1,7 @@ {include file='userMenuSidebar'} {capture assign='contentHeaderNavigation'} -
  • {lang}wcf.page.minecraftIDCheck.resend{/lang}
    • +
  • {lang}wcf.page.minecraftUserCheck.resend{/lang}
    • {/capture} {include file='header' __sidebarLeftHasMenu=true} @@ -18,4 +18,4 @@ {/hascontent} -{include file='footer'} \ No newline at end of file +{include file='footer'} diff --git a/templates/minecraftIDList.tpl b/templates/minecraftUserList.tpl similarity index 65% rename from templates/minecraftIDList.tpl rename to templates/minecraftUserList.tpl index 18e9f67..55d3bc3 100644 --- a/templates/minecraftIDList.tpl +++ b/templates/minecraftUserList.tpl @@ -2,7 +2,7 @@ {capture assign='contentHeaderNavigation'} {if MINECRAFT_MAX_UUIDS == 0 || $objects|count < MINECRAFT_MAX_UUIDS} -
  • {lang}wcf.page.minecraftList.add{/lang}
    • +
  • {lang}wcf.page.minecraftUserList.add{/lang}
    • {/if} {/capture} @@ -11,30 +11,30 @@ {hascontent}
    {content} - {pages print=true assign='pagesLinks' controller='MinecraftIDList' link="pageNo=%d"} + {pages print=true assign='pagesLinks' controller='MinecraftUserList' link="pageNo=%d"} {/content}
    {/hascontent} {if $objects|count > 0}
    -
    - {objectAction action="delete" objectTitle=$minecraft->title} + {objectAction action="delete" objectTitle=$minecraftUser->title} {@$minecraft->minecraftID}{$minecraft->title}{@$minecraft->minecraftUUID}{@$minecraft->createdDate|time}{@$minecraftUser->minecraftUserID}{$minecraftUser->title}{@$minecraftUser->minecraftUUID}{@$minecraftUser->createdDate|time}
    +
    - - - - + + + + {foreach from=$objects item=object} - + - + diff --git a/userMenu.xml b/userMenu.xml index de7e6a9..d17b9d5 100644 --- a/userMenu.xml +++ b/userMenu.xml @@ -7,8 +7,8 @@ user.minecraftLinker.canManageminecraft_linker_enabled,minecraft_linker_identity - - + + wcf.user.menu.minecraftSection 1 user.minecraftLinker.canManage
    {lang}wcf.page.minecraftList.table.minecraftID{/lang}{lang}wcf.page.minecraftList.table.title{/lang}{lang}wcf.page.minecraftList.table.minecraftUUID{/lang}{lang}wcf.page.minecraftList.table.createdDate{/lang}{lang}wcf.page.minecraftUserList.table.minecraftUserID{/lang}{lang}wcf.page.minecraftUserList.table.title{/lang}{lang}wcf.page.minecraftUserList.table.minecraftUUID{/lang}{lang}wcf.page.minecraftUserList.table.createdDate{/lang}
    {objectAction action="delete" objectTitle=$object->title} {#$object->minecraftID}{#$object->minecraftUserID} {$object->title} {$object->minecraftUUID} {@$object->createdDate|time}