Hopefully this fixes the tests

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index f3170c71519520ccf5bf017d536e611d974f36ca..0832dae45a49453398d0c241b3800c56f056ad3b 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,6 +5,7 @@
 namespace Friendica\Core;
 
 use Friendica\App;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
@@ -67,7 +68,7 @@ class UserImport
                        unset($arr['id']);
                }
 
-               self::check_cols($table, $arr);
+               self::checkCols($table, $arr);
                $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
                $vals = implode("','", array_map('dbesc', array_values($arr)));
                $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
@@ -100,39 +101,21 @@ class UserImport
 
                $account = json_decode(file_get_contents($file['tmp_name']), true);
                if ($account === null) {
-                       notice(t("Error decoding account file"));
+                       notice(L10n::t("Error decoding account file"));
                        return;
                }
 
 
                if (!x($account, 'version')) {
-                       notice(t("Error! No version data in file! This is not a Friendica account file?"));
+                       notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
                        return;
                }
 
                // check for username
-               $r = dba::selectFirst('user', ['uid'], ['nickname' => $account['user']['nickname']]);
-               if ($r === false) {
-                       logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
-                       notice(t('Error! Cannot check nickname'));
-                       return;
-               }
-
-               if (DBM::is_result($r) > 0) {
-                       notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
-                       return;
-               }
-
                // check if username matches deleted account
-               $r = dba::selectFirst('userd', ['id'], ['username' => $account['user']['nickname']]);
-               if ($r === false) {
-                       logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
-                       notice(t('Error! Cannot check nickname'));
-                       return;
-               }
-
-               if (DBM::is_result($r) > 0) {
-                       notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
+               if (dba::exists('user', ['nickname' => $account['user']['nickname']])
+                       || dba::exists('userd', ['username' => $account['user']['nickname']])) {
+                       notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
                        return;
                }
 
@@ -165,16 +148,13 @@ class UserImport
                $r = self::dbImportAssoc('user', $account['user']);
                if ($r === false) {
                        logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
-                       notice(t("User creation error"));
+                       notice(L10n::t("User creation error"));
                        return;
                }
                $newuid = self::lastInsertId();
 
                PConfig::set($newuid, 'system', 'previous_addr', $old_handle);
 
-               // Generate a new guid for the account. Otherwise there will be problems with diaspora
-               dba::update('user', ['guid' => generate_user_guid()], ['uid' => $newuid]);
-
                foreach ($account['profile'] as &$profile) {
                        foreach ($profile as $k => &$v) {
                                $v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v);
@@ -186,7 +166,7 @@ class UserImport
                        $r = self::dbImportAssoc('profile', $profile);
                        if ($r === false) {
                                logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
-                               info(t("User profile creation error"));
+                               info(L10n::t("User profile creation error"));
                                dba::delete('user', ['uid' => $newuid]);
                                return;
                        }
@@ -230,7 +210,7 @@ class UserImport
                        }
                }
                if ($errorcount > 0) {
-                       notice(sprintf(tt("%d contact not imported", "%d contacts not imported", $errorcount), $errorcount));
+                       notice(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount));
                }
 
                foreach ($account['group'] as &$group) {
@@ -295,7 +275,7 @@ class UserImport
                // send relocate messages
                Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
 
-               info(t("Done. You can now login with your username and password"));
+               info(L10n::t("Done. You can now login with your username and password"));
                goaway(System::baseUrl() . "/login");
        }
 }