Merge pull request #11015 from MrPetovan/task/10979-frio-time-tooltip

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index ed131910c74c9444cdcd8926d2854ffa7c25f6af..fbc89ccf580ce0deed66a66dc9421c33bce321aa 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,14 +21,13 @@
 
 namespace Friendica\Core;
 
-use Friendica\App;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\Photo;
+use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Repository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
@@ -111,7 +110,7 @@ class UserImport
         */
        public static function importAccount($file)
        {
-               Logger::log("Start user import from " . $file['tmp_name']);
+               Logger::notice("Start user import from " . $file['tmp_name']);
                /*
                STEPS
                1. checks
@@ -172,7 +171,7 @@ class UserImport
                // import user
                $r = self::dbImportAssoc('user', $account['user']);
                if ($r === false) {
-                       Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO);
+                       Logger::warning("uimport:insert user : ERROR : " . DBA::errorMessage());
                        notice(DI::l10n()->t("User creation error"));
                        return;
                }
@@ -211,7 +210,7 @@ class UserImport
                        $contact['uid'] = $newuid;
                        $r = self::dbImportAssoc('contact', $contact);
                        if ($r === false) {
-                               Logger::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
+                               Logger::warning("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage());
                                $errorcount++;
                        } else {
                                $contact['newid'] = self::lastInsertId();
@@ -225,7 +224,7 @@ class UserImport
                        $group['uid'] = $newuid;
                        $r = self::dbImportAssoc('group', $group);
                        if ($r === false) {
-                               Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
+                               Logger::warning("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage());
                        } else {
                                $group['newid'] = self::lastInsertId();
                        }
@@ -250,7 +249,7 @@ class UserImport
                        if ($import == 2) {
                                $r = self::dbImportAssoc('group_member', $group_member);
                                if ($r === false) {
-                                       Logger::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
+                                       Logger::warning("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage());
                                }
                        }
                }
@@ -270,7 +269,7 @@ class UserImport
                                $r = self::dbImportAssoc('profile', $profile);
 
                                if ($r === false) {
-                                       Logger::log("uimport:insert profile: ERROR : " . DBA::errorMessage(), Logger::INFO);
+                                       Logger::warning("uimport:insert profile: ERROR : " . DBA::errorMessage());
                                        notice(DI::l10n()->t("User profile creation error"));
                                        DBA::delete('user', ['uid' => $newuid]);
                                        DBA::delete('profile_field', ['uid' => $newuid]);
@@ -280,19 +279,16 @@ class UserImport
                                $profile['id'] = DBA::lastInsertId();
                        }
 
-                       DI::profileField()->migrateFromLegacyProfile($profile);
+                       Profile::migrate($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);
+               $permissionSet = DI::permissionSet()->selectDefaultForUser($newuid);
 
                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;
+                       $profile_field['psid'] = $profile_field['psid'] ? $permissionSet->uid : PermissionSet::PUBLIC;
 
                        if (self::dbImportAssoc('profile_field', $profile_field) === false) {
                                Logger::info("uimport:insert profile field " . $profile_field['id'] . " : ERROR : " . DBA::errorMessage());
@@ -312,7 +308,7 @@ class UserImport
                        );
 
                        if ($r === false) {
-                               Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
+                               Logger::warning("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage());
                        }
                }
 
@@ -320,7 +316,7 @@ class UserImport
                        $pconfig['uid'] = $newuid;
                        $r = self::dbImportAssoc('pconfig', $pconfig);
                        if ($r === false) {
-                               Logger::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
+                               Logger::warning("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage());
                        }
                }