Import the avatar in UserImporter and remove UserAvatarImporter

Author: Cyperghost

com.woltlab.wcf/fileDelete.xml

@@ -2771,6 +2771,7 @@
 		<file>lib/system/html/output/node/HtmlOutputNodeWoltlabSize.class.php</file>
 		<file>lib/system/html/output/node/QuoteHtmlOutputNode.class.php</file>
 		<file>lib/system/image/Thumbnail.class.php</file>
+		<file>lib/system/importer/UserAvatarImporter.class.php</file>
 		<file>lib/system/language/I18nPlural.class.php</file>
 		<file>lib/system/language/LanguageServerProcessor.class.php</file>
 		<file>lib/system/language/preload/LanguagePreloader.class.php</file>

com.woltlab.wcf/objectType.xml

@@ -432,11 +432,6 @@
 			<definitionname>com.woltlab.wcf.importer</definitionname>
 			<classname>wcf\system\importer\UserOptionImporter</classname>
 		</type>
-		<type>
-			<name>com.woltlab.wcf.user.avatar</name>
-			<definitionname>com.woltlab.wcf.importer</definitionname>
-			<classname>wcf\system\importer\UserAvatarImporter</classname>
-		</type>
 		<type>
 			<name>com.woltlab.wcf.user.comment</name>
 			<definitionname>com.woltlab.wcf.importer</definitionname>
@@ -1804,5 +1799,8 @@
 		<type name="com.woltlab.wcf.sitemap">
 			<definitionname>com.woltlab.wcf.rebuildData</definitionname>
 		</type>
+		<type name="com.woltlab.wcf.user.avatar">
+			<definitionname>com.woltlab.wcf.importer</definitionname>
+		</type>
 	</delete>
 </data>

wcfsetup/install/files/lib/data/file/FileEditor.class.php

@@ -117,7 +117,8 @@ public static function createFromTemporary(FileTemporary $fileTemporary): File
     public static function createFromExistingFile(
         string $pathname,
         string $originalFilename,
-        string $objectTypeName
+        string $objectTypeName,
+        bool $copy = false
     ): ?File {
         if (!\is_readable($pathname)) {
             return null;
@@ -174,10 +175,11 @@ public static function createFromExistingFile(
             \mkdir($filePath, recursive: true);
         }
 
-        \rename(
-            $pathname,
-            $filePath . $file->getSourceFilename()
-        );
+        if ($copy) {
+            \copy($pathname, $filePath . $file->getSourceFilename());
+        } else {
+            \rename($pathname, $filePath . $file->getSourceFilename());
+        }
 
         return $file;
     }

wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php

@@ -2,6 +2,7 @@
 
 namespace wcf\system\importer;
 
+use wcf\data\file\FileEditor;
 use wcf\data\user\group\UserGroup;
 use wcf\data\user\option\UserOption;
 use wcf\data\user\option\UserOptionList;
@@ -201,6 +202,18 @@ public function import($oldID, array $data, array $additionalData = [])
         // assign an interface language
         $data['languageID'] = \reset($languageIDs);
 
+        if (!empty($additionalData['avatarLocation']) && \is_readable($additionalData['avatarLocation'])) {
+            $avatarFile = FileEditor::createFromExistingFile(
+                $additionalData['avatarLocation'],
+                $additionalData['avatarFilename'] ?? \pathinfo($additionalData['avatarLocation'], \PATHINFO_BASENAME),
+                'com.woltlab.wcf.user.avatar',
+                true
+            );
+            if ($avatarFile !== null) {
+                $data['avatarFileID'] = $avatarFile->fileID;
+            }
+        }
+
         // create user
         $user = UserEditor::create($data);
         $userEditor = new UserEditor($user);