Update data name

xXSchrandXx · Jan 5, 2022 · 2d38c43 · 2d38c43
1 parent 407d644
commit 2d38c43
Show file tree

Hide file tree

Showing 23 changed files with 185 additions and 191 deletions.
diff --git a/acptemplates/__minecraftUserAddSection.tpl b/acptemplates/__minecraftUserAddSection.tpl
@@ -3,11 +3,11 @@
 	<section class="section">
 		<h2 class="sectionTitle">{lang}wcf.page.userAddSection.minecraft.sectionTitle{/lang}</h2>
 
-		<a href="{if !$userID|empty}{link controller='MinecraftIDAdd' id=$userID}{/link}{/if}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.page.userAddSection.minecraft.add{/lang}</span></a><br><br>
+		<a href="{if !$userID|empty}{link controller='MinecraftUserAdd' id=$userID}{/link}{/if}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.page.userAddSection.minecraft.add{/lang}</span></a><br><br>
 
-		{if $minecrafts|count > 0}
+		{if $minecraftUsers|count > 0}
 			<div class="tabularBox">
-				<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\user\minecraft\MinecraftAction">
+				<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\user\minecraft\MinecraftUserAction">
 					<thead>
 						<tr>
 							<th></th>
@@ -18,15 +18,15 @@
 						</tr>
 					</thead>
 					<tbody>
-							{foreach from=$minecrafts item=minecraft}
-								<tr class="jsObjectActionObject" data-object-id="{@$minecraft->minecraftID}">
+							{foreach from=$minecraftUsers item=minecraftUser}
+								<tr class="jsObjectActionObject" data-object-id="{@$minecraftUser->minecraftUserID}">
 									<td>
-										{objectAction action="delete" objectTitle=$minecraft->title}
+										{objectAction action="delete" objectTitle=$minecraftUser->title}
 									</td>
-									<td>{@$minecraft->minecraftID}</td>
-									<td>{$minecraft->title}</td>
-									<td>{@$minecraft->minecraftUUID}</td>
-									<td>{@$minecraft->createdDate|time}</td>
+									<td>{@$minecraftUser->minecraftUserID}</td>
+									<td>{$minecraftUser->title}</td>
+									<td>{@$minecraftUser->minecraftUUID}</td>
+									<td>{@$minecraftUser->createdDate|time}</td>
 								</tr>
 							{/foreach}
 					</tbody>

diff --git a/acptemplates/minecraftIDAdd.tpl → acptemplates/minecraftUserAdd.tpl b/acptemplates/minecraftIDAdd.tpl → acptemplates/minecraftUserAdd.tpl
@@ -2,11 +2,11 @@
 
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
-		<h1 class="contentTitle">{lang}wcf.page.minecraftIDAddACP.pageTitle{/lang}</h1>
+		<h1 class="contentTitle">{lang}wcf.page.minecraftUserAddACP.pageTitle{/lang}</h1>
 	</div>
 	<nav class="contentHeaderNavigation" role="presentation">
 		<ul>
-			<li><a href="{link controller='UserEdit' id=$userID}{/link}" class="button"><span class="icon icon16 fa-arrow-left"></span> <span>{lang}wcf.page.minecraftIDAddACP.back{/lang}</span></a></li>
+			<li><a href="{link controller='UserEdit' id=$userID}{/link}" class="button"><span class="icon icon16 fa-arrow-left"></span> <span>{lang}wcf.page.minecraftUserAddACP.back{/lang}</span></a></li>
 		</ul>
 </header>
 

diff --git a/...xschrandxx.wsc.minecraft-linker_1.0.0.php → ...l_de.xxschrandxx.wsc.minecraft-linker.php b/...xschrandxx.wsc.minecraft-linker_1.0.0.php → ...l_de.xxschrandxx.wsc.minecraft-linker.php
@@ -6,27 +6,29 @@
 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'),
         ]),
 
     // 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/...lib/acp/form/MinecraftIDAddForm.class.php → ...b/acp/form/MinecraftUserAddForm.class.php b/...lib/acp/form/MinecraftIDAddForm.class.php → ...b/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,40 +93,40 @@ 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')
         ];
 
         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/...b/data/user/minecraft/Minecraft.class.php → ...ta/user/minecraft/MinecraftUser.class.php b/...b/data/user/minecraft/Minecraft.class.php → ...ta/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/.../user/minecraft/MinecraftAction.class.php → ...r/minecraft/MinecraftUserAction.class.php b/.../user/minecraft/MinecraftAction.class.php → ...r/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/.../user/minecraft/MinecraftEditor.class.php → ...r/minecraft/MinecraftUserEditor.class.php b/.../user/minecraft/MinecraftEditor.class.php → ...r/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/...ta/user/minecraft/MinecraftList.class.php → ...ser/minecraft/MinecraftUserList.class.php b/...ta/user/minecraft/MinecraftList.class.php → ...ser/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 → ...s/lib/form/MinecraftUserAddForm.class.php b/files/lib/form/MinecraftIDAddForm.class.php → ...s/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,15 +68,16 @@ 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');
         $title = WCF::getSession()->getVar('mcTitle');
         $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,17 +107,17 @@ 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);
         }
 
         $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;
     }