X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUserImport.php;h=be7bbf0b575b44cf8d3561ad905dc3d3eedb7e76;hb=f826ce70ceb9f810a16b70d3d77b9ba2c8d9097d;hp=b6ecd74a244e631b467e2396e1fb8ba0820b6dc0;hpb=322b7c856ca9ba53bd9c7da50dd5c1e3c9197d56;p=friendica.git

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index b6ecd74a24..be7bbf0b57 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -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,10 +105,11 @@ 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::notice("Start user import from " . $file['tmp_name']);
 		/*
@@ -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;
 		}
 
@@ -172,7 +173,7 @@ class UserImport
 		$r = self::dbImportAssoc('user', $account['user']);
 		if ($r === false) {
 			Logger::warning("uimport:insert user : ERROR : " . DBA::errorMessage());
-			notice(DI::l10n()->t("User creation error"));
+			DI::sysmsg()->addNotice(DI::l10n()->t("User creation error"));
 			return;
 		}
 		$newuid = self::lastInsertId();
@@ -217,7 +218,7 @@ class UserImport
 			}
 		}
 		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) {
@@ -270,7 +271,7 @@ class UserImport
 
 				if ($r === false) {
 					Logger::warning("uimport:insert profile: ERROR : " . DBA::errorMessage());
-					notice(DI::l10n()->t("User profile creation error"));
+					DI::sysmsg()->addNotice(DI::l10n()->t("User profile creation error"));
 					DBA::delete('user', ['uid' => $newuid]);
 					DBA::delete('profile_field', ['uid' => $newuid]);
 					return;
@@ -321,9 +322,9 @@ class UserImport
 		}
 
 		// 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');
 	}
 }