X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FUserImport.php;h=0832dae45a49453398d0c241b3800c56f056ad3b;hb=271b6cb8f93e6827e950de2ea99bc2403ab099f9;hp=582f4d0c3b429a326cabfea7c565eb456c30b9ad;hpb=208a149a7b7e25dc84c39e5631cba11d41869bae;p=friendica.git

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 582f4d0c3b..0832dae45a 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -68,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')";
@@ -112,27 +112,9 @@ 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(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) {
+		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;
 		}
@@ -173,9 +155,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);