Check that provided class implements IStorage in StorageManager::setBackend

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 7ccb6f80cbd7aa5d98ab7646b3a71bcf9f87bd16..1e103c1f5df8451c1614e942cea8030d399436f3 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,13 +5,10 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
-
-require_once "include/dba.php";
+use Friendica\Util\Strings;
 
 /**
  * @brief UserImport class
@@ -33,7 +30,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)
        {
@@ -57,7 +55,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)
        {
@@ -81,8 +81,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)
        {
@@ -103,7 +105,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;
                }
@@ -119,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'];
@@ -128,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']);