Merge pull request #8222 from annando/ap-gnusocial

[friendica.git] / src / Core / UserImport.php

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index d48d179fa6540e89a0134e383c46a980f0c9be8c..f09db9868667198e63d1f8496ecadc7f738ae5a4 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -8,8 +8,10 @@ use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
+use Friendica\Repository\PermissionSet;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
@@ -161,23 +163,6 @@ class UserImport
 
                DI::pConfig()->set($newuid, 'system', 'previous_addr', $old_handle);
 
-               foreach ($account['profile'] as &$profile) {
-                       foreach ($profile as $k => &$v) {
-                               $v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
-                               foreach (["profile", "avatar"] as $k) {
-                                       $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
-                               }
-                       }
-                       $profile['uid'] = $newuid;
-                       $r = self::dbImportAssoc('profile', $profile);
-                       if ($r === false) {
-                               Logger::log("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
-                               info(DI::l10n()->t("User profile creation error"));
-                               DBA::delete('user', ['uid' => $newuid]);
-                               return;
-                       }
-               }
-
                $errorcount = 0;
                foreach ($account['contact'] as &$contact) {
                        if ($contact['uid'] == $olduid && $contact['self'] == '1') {
@@ -216,7 +201,7 @@ class UserImport
                        }
                }
                if ($errorcount > 0) {
-                       notice(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount));
+                       notice(DI::l10n()->tt("%d contact not imported", "%d contacts not imported", $errorcount));
                }
 
                foreach ($account['group'] as &$group) {
@@ -253,6 +238,50 @@ class UserImport
                        }
                }
 
+               foreach ($account['profile'] as &$profile) {
+                       unset($profile['id']);
+                       $profile['uid'] = $newuid;
+
+                       foreach ($profile as $k => &$v) {
+                               $v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
+                               foreach (["profile", "avatar"] as $k) {
+                                       $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v);
+                               }
+                       }
+
+                       if (count($account['profile']) === 1 || $profile['is-default']) {
+                               $r = self::dbImportAssoc('profile', $profile);
+
+                               if ($r === false) {
+                                       Logger::log("uimport:insert profile: ERROR : " . DBA::errorMessage(), Logger::INFO);
+                                       info(DI::l10n()->t("User profile creation error"));
+                                       DBA::delete('user', ['uid' => $newuid]);
+                                       DBA::delete('profile_field', ['uid' => $newuid]);
+                                       return;
+                               }
+
+                               $profile['id'] = DBA::lastInsertId();
+                       }
+
+                       DI::profileField()->migrateFromLegacyProfile($profile);
+               }
+
+               ///@TODO Replace with permissionset import
+               $self_contact = Contact::selectFirst(['id'], ['uid' => $newuid, 'self' => true]);
+               $allow_cid = DI::aclFormatter()->toString($self_contact['id']);
+               $self_psid = DI::permissionSet()->getIdFromACL($newuid, $allow_cid);
+
+               foreach ($account['profile_fields'] ?? [] as $profile_field) {
+                       $profile_field['uid'] = $newuid;
+
+                       ///@TODO Replace with permissionset import
+                       $profile_field['psid'] = $profile_field['psid'] ? $self_psid : PermissionSet::PUBLIC;
+
+                       if (self::dbImportAssoc('profile_field', $profile_field) === false) {
+                               Logger::info("uimport:insert profile field " . $profile_field['id'] . " : ERROR : " . DBA::errorMessage());
+                       }
+               }
+
                foreach ($account['photo'] as &$photo) {
                        $photo['uid'] = $newuid;
                        $photo['data'] = hex2bin($photo['data']);