X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUserImport.php;h=6cefae556f30ba8713af1bfb9bcef36d3ed1bf81;hb=070aa016e0915c6bba9326a94f7394acd2b21e7f;hp=5488fe43f0f26f35d07b649763db9b0d1d161e5d;hpb=d577ab98eb0f28f9f807795f54c87d80ef9c0dc2;p=friendica.git

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 5488fe43f0..6cefae556f 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -7,13 +7,12 @@ namespace Friendica\Core;
 use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Strings;
 
-require_once "include/dba.php";
-
 /**
  * @brief UserImport class
  */
@@ -34,7 +33,8 @@ class UserImport
 	 * Remove columns from array $arr that aren't in table $table
 	 *
 	 * @param string $table Table name
-	 * @param array &$arr Column=>Value array from json (by ref)
+	 * @param array &$arr   Column=>Value array from json (by ref)
+	 * @throws \Exception
 	 */
 	private static function checkCols($table, &$arr)
 	{
@@ -58,7 +58,9 @@ class UserImport
 	 * Import data into table $table
 	 *
 	 * @param string $table Table name
-	 * @param array $arr Column=>Value array from json
+	 * @param array  $arr   Column=>Value array from json
+	 * @return array|bool
+	 * @throws \Exception
 	 */
 	private static function dbImportAssoc($table, $arr)
 	{
@@ -82,8 +84,10 @@ class UserImport
 	/**
 	 * @brief Import account file exported from mod/uexport
 	 *
-	 * @param App $a Friendica App Class
+	 * @param App   $a    Friendica App Class
 	 * @param array $file array from $_FILES
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \ImagickException
 	 */
 	public static function importAccount(App $a, $file)
 	{
@@ -104,7 +108,7 @@ class UserImport
 		}
 
 
-		if (!x($account, 'version')) {
+		if (empty($account['version'])) {
 			notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
 			return;
 		}
@@ -129,6 +133,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']);