X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUserImport.php;h=1e103c1f5df8451c1614e942cea8030d399436f3;hb=c8331eb0688a2537e2778c8775f608a435b403a6;hp=1e2693a944b04c85f475a09a74c36e5a23ec5120;hpb=88a4733e5fbca62826f4015746c99ce603e1f3ba;p=friendica.git

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 1e2693a944..1e103c1f5d 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,16 +5,11 @@
 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
  */
@@ -35,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)
 	{
@@ -59,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)
 	{
@@ -83,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)
 	{
@@ -105,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;
 		}