Frio - Bring back some padding space (#5585)

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 96491e27b63b3a8f4365478a338e2cfe78cc4b4c..efd4bd2f8fea963872d79b467118be380903d7d1 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,14 +5,9 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Core\PConfig;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
-use dba;
 
 require_once "include/dba.php";
 
@@ -29,7 +24,7 @@ class UserImport
                        return 1;
                }
 
-               return dba::lastInsertId();
+               return DBA::lastInsertId();
        }
 
        /**
@@ -40,7 +35,7 @@ class UserImport
         */
        private static function checkCols($table, &$arr)
        {
-               $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
+               $query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
                logger("uimport: $query", LOGGER_DEBUG);
                $r = q($query);
                $tcols = [];
@@ -68,9 +63,9 @@ class UserImport
                        unset($arr['id']);
                }
 
-               self::check_cols($table, $arr);
-               $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
-               $vals = implode("','", array_map('dbesc', array_values($arr)));
+               self::checkCols($table, $arr);
+               $cols = implode("`,`", array_map(['Friendica\Database\DBA', 'escape'], array_keys($arr)));
+               $vals = implode("','", array_map(['Friendica\Database\DBA', 'escape'], array_values($arr)));
                $query = "INSERT INTO `$table` (`$cols`) VALUES ('$vals')";
                logger("uimport: $query", LOGGER_TRACE);
 
@@ -112,28 +107,10 @@ class UserImport
                }
 
                // 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(L10n::t('Error! Cannot check nickname'));
-                       return;
-               }
-
-               if (DBM::is_result($r) > 0) {
-                       notice(sprintf(L10n::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(L10n::t('Error! Cannot check nickname'));
-                       return;
-               }
-
-               if (DBM::is_result($r) > 0) {
-                       notice(sprintf(L10n::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,7 +142,7 @@ class UserImport
                // import user
                $r = self::dbImportAssoc('user', $account['user']);
                if ($r === false) {
-                       logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                       logger("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                        notice(L10n::t("User creation error"));
                        return;
                }
@@ -173,9 +150,6 @@ class UserImport
 
                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,9 +160,9 @@ class UserImport
                        $profile['uid'] = $newuid;
                        $r = self::dbImportAssoc('profile', $profile);
                        if ($r === false) {
-                               logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                                info(L10n::t("User profile creation error"));
-                               dba::delete('user', ['uid' => $newuid]);
+                               DBA::delete('user', ['uid' => $newuid]);
                                return;
                        }
                }
@@ -224,21 +198,21 @@ class UserImport
                        $contact['uid'] = $newuid;
                        $r = self::dbImportAssoc('contact', $contact);
                        if ($r === false) {
-                               logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                                $errorcount++;
                        } else {
                                $contact['newid'] = self::lastInsertId();
                        }
                }
                if ($errorcount > 0) {
-                       notice(sprintf(L10n::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) {
                        $group['uid'] = $newuid;
                        $r = self::dbImportAssoc('group', $group);
                        if ($r === false) {
-                               logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               logger("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                        } else {
                                $group['newid'] = self::lastInsertId();
                        }
@@ -263,7 +237,7 @@ class UserImport
                        if ($import == 2) {
                                $r = self::dbImportAssoc('group_member', $group_member);
                                if ($r === false) {
-                                       logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                                       logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                                }
                        }
                }
@@ -281,7 +255,7 @@ class UserImport
                        );
 
                        if ($r === false) {
-                               logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                        }
                }
 
@@ -289,7 +263,7 @@ class UserImport
                        $pconfig['uid'] = $newuid;
                        $r = self::dbImportAssoc('pconfig', $pconfig);
                        if ($r === false) {
-                               logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
                        }
                }