X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUserImport.php;h=1e2693a944b04c85f475a09a74c36e5a23ec5120;hb=98d90e131ded624c552102dd450a21e6a67aecf1;hp=582f4d0c3b429a326cabfea7c565eb456c30b9ad;hpb=6b44fbbda03af125035c185c964f10ce78f97610;p=friendica.git

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 582f4d0c3b..1e2693a944 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,14 +5,13 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 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;
+use Friendica\Util\Strings;
 
 require_once "include/dba.php";
 
@@ -29,7 +28,7 @@ class UserImport
 			return 1;
 		}
 
-		return dba::lastInsertId();
+		return DBA::lastInsertId();
 	}
 
 	/**
@@ -40,8 +39,8 @@ class UserImport
 	 */
 	private static function checkCols($table, &$arr)
 	{
-		$query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
-		logger("uimport: $query", LOGGER_DEBUG);
+		$query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
+		Logger::log("uimport: $query", Logger::DEBUG);
 		$r = q($query);
 		$tcols = [];
 		// get a plain array of column names
@@ -68,11 +67,11 @@ 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);
+		Logger::log("uimport: $query", Logger::TRACE);
 
 		if (self::IMPORT_DEBUG) {
 			return true;
@@ -89,7 +88,7 @@ class UserImport
 	 */
 	public static function importAccount(App $a, $file)
 	{
-		logger("Start user import from " . $file['tmp_name']);
+		Logger::log("Start user import from " . $file['tmp_name']);
 		/*
 		STEPS
 		1. checks
@@ -112,27 +111,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;
 		}
@@ -140,8 +121,8 @@ class UserImport
 		$oldbaseurl = $account['baseurl'];
 		$newbaseurl = System::baseUrl();
 
-		$oldaddr = str_replace('http://', '@', normalise_link($oldbaseurl));
-		$newaddr = str_replace('http://', '@', normalise_link($newbaseurl));
+		$oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl));
+		$newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl));
 
 		if (!empty($account['profile']['addr'])) {
 			$old_handle = $account['profile']['addr'];
@@ -149,6 +130,9 @@ class UserImport
 			$old_handle = $account['user']['nickname'].$oldaddr;
 		}
 
+		// Creating a new guid to avoid problems with Diaspora
+		$account['user']['guid'] = System::createUUID();
+
 		$olduid = $account['user']['uid'];
 
 		unset($account['user']['uid']);
@@ -165,7 +149,7 @@ class UserImport
 		// import user
 		$r = self::dbImportAssoc('user', $account['user']);
 		if ($r === false) {
-			logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+			Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO);
 			notice(L10n::t("User creation error"));
 			return;
 		}
@@ -173,9 +157,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 +167,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::log("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;
 			}
 		}
@@ -205,15 +186,15 @@ class UserImport
 			}
 			if ($contact['uid'] == $olduid && $contact['self'] == '0') {
 				// set contacts 'avatar-date' to NULL_DATE to let worker to update urls
-				$contact["avatar-date"] = NULL_DATE;
+				$contact["avatar-date"] = DBA::NULL_DATETIME;
 
 				switch ($contact['network']) {
-					case NETWORK_DFRN:
-					case NETWORK_DIASPORA:
+					case Protocol::DFRN:
+					case Protocol::DIASPORA:
 						//  send relocate message (below)
 						break;
-					case NETWORK_FEED:
-					case NETWORK_MAIL:
+					case Protocol::FEED:
+					case Protocol::MAIL:
 						// Nothing to do
 						break;
 					default:
@@ -224,7 +205,7 @@ 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::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
 				$errorcount++;
 			} else {
 				$contact['newid'] = self::lastInsertId();
@@ -238,7 +219,7 @@ class UserImport
 			$group['uid'] = $newuid;
 			$r = self::dbImportAssoc('group', $group);
 			if ($r === false) {
-				logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
 			} else {
 				$group['newid'] = self::lastInsertId();
 			}
@@ -263,7 +244,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::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
 				}
 			}
 		}
@@ -281,7 +262,7 @@ class UserImport
 			);
 
 			if ($r === false) {
-				logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+				Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
 			}
 		}
 
@@ -289,7 +270,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::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
 			}
 		}
 
@@ -297,6 +278,6 @@ class UserImport
 		Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
 
 		info(L10n::t("Done. You can now login with your username and password"));
-		goaway(System::baseUrl() . "/login");
+		$a->internalRedirect('login');
 	}
 }