Merge pull request #12078 from MrPetovan/task/4090-move-mod-wallmessage

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 309e5c2a9632426c12ce57955f5feefeeeb34ca2..be7bbf0b575b44cf8d3561ad905dc3d3eedb7e76 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,7 @@ use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Security\PermissionSet\Depository\PermissionSet;
+use Friendica\Security\PermissionSet\Repository\PermissionSet;
 use Friendica\Util\Strings;
 use Friendica\Worker\Delivery;
 
@@ -86,7 +86,7 @@ class UserImport
         * @return array|bool
         * @throws \Exception
         */
-       private static function dbImportAssoc($table, $arr)
+       private static function dbImportAssoc(string $table, array $arr)
        {
                if (isset($arr['id'])) {
                        unset($arr['id']);
@@ -105,12 +105,13 @@ class UserImport
         * Import account file exported from mod/uexport
         *
         * @param array $file array from $_FILES
+        * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function importAccount($file)
+       public static function importAccount(array $file)
        {
-               Logger::log("Start user import from " . $file['tmp_name']);
+               Logger::notice("Start user import from " . $file['tmp_name']);
                /*
                STEPS
                1. checks
@@ -122,13 +123,13 @@ class UserImport
 
                $account = json_decode(file_get_contents($file['tmp_name']), true);
                if ($account === null) {
-                       notice(DI::l10n()->t("Error decoding account file"));
+                       DI::sysmsg()->addNotice(DI::l10n()->t("Error decoding account file"));
                        return;
                }
 
 
                if (empty($account['version'])) {
-                       notice(DI::l10n()->t("Error! No version data in file! This is not a Friendica account file?"));
+                       DI::sysmsg()->addNotice(DI::l10n()->t("Error! No version data in file! This is not a Friendica account file?"));
                        return;
                }
 
@@ -136,7 +137,7 @@ class UserImport
                // check if username matches deleted account
                if (DBA::exists('user', ['nickname' => $account['user']['nickname']])
                        || DBA::exists('userd', ['username' => $account['user']['nickname']])) {
-                       notice(DI::l10n()->t("User '%s' already exists on this server!", $account['user']['nickname']));
+                       DI::sysmsg()->addNotice(DI::l10n()->t("User '%s' already exists on this server!", $account['user']['nickname']));
                        return;
                }
 
@@ -171,8 +172,8 @@ class UserImport
                // import user
                $r = self::dbImportAssoc('user', $account['user']);
                if ($r === false) {
-                       Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO);
-                       notice(DI::l10n()->t("User creation error"));
+                       Logger::warning("uimport:insert user : ERROR : " . DBA::errorMessage());
+                       DI::sysmsg()->addNotice(DI::l10n()->t("User creation error"));
                        return;
                }
                $newuid = self::lastInsertId();
@@ -210,21 +211,21 @@ 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();
                        }
                }
                if ($errorcount > 0) {
-                       notice(DI::l10n()->tt("%d contact not imported", "%d contacts not imported", $errorcount));
+                       DI::sysmsg()->addNotice(DI::l10n()->tt("%d contact not imported", "%d contacts not imported", $errorcount));
                }
 
                foreach ($account['group'] as &$group) {
                        $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();
                        }
@@ -249,7 +250,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());
                                }
                        }
                }
@@ -269,8 +270,8 @@ class UserImport
                                $r = self::dbImportAssoc('profile', $profile);
 
                                if ($r === false) {
-                                       Logger::log("uimport:insert profile: ERROR : " . DBA::errorMessage(), Logger::INFO);
-                                       notice(DI::l10n()->t("User profile creation error"));
+                                       Logger::warning("uimport:insert profile: ERROR : " . DBA::errorMessage());
+                                       DI::sysmsg()->addNotice(DI::l10n()->t("User profile creation error"));
                                        DBA::delete('user', ['uid' => $newuid]);
                                        DBA::delete('profile_field', ['uid' => $newuid]);
                                        return;
@@ -279,7 +280,7 @@ class UserImport
                                $profile['id'] = DBA::lastInsertId();
                        }
 
-                       Profile::migrateFromLegacyProfile($profile);
+                       Profile::migrate($profile);
                }
 
                $permissionSet = DI::permissionSet()->selectDefaultForUser($newuid);
@@ -308,7 +309,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());
                        }
                }
 
@@ -316,14 +317,14 @@ 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());
                        }
                }
 
                // send relocate messages
-               Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $newuid);
+               Worker::add(Worker::PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $newuid);
 
-               info(DI::l10n()->t("Done. You can now login with your username and password"));
+               DI::sysmsg()->addInfo(DI::l10n()->t("Done. You can now login with your username and password"));
                DI::baseUrl()->redirect('login');
        }
 }