code lisibility & filter optimization

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 70d93b0cc0900fbc67272a934bccbe48f6a636e0..0a4223fecdf5f45241051631dcb23a0c5d10aab2 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,16 +5,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\Database\DBStructure;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Strings;
 
-require_once "include/dba.php";
-
 /**
  * @brief UserImport class
  */
@@ -35,16 +31,16 @@ 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)
        {
-               $query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
-               Logger::log("uimport: $query", Logger::DEBUG);
-               $r = q($query);
+               $tableColumns = DBStructure::getColumns($table);
+
                $tcols = [];
                // get a plain array of column names
-               foreach ($r as $tcol) {
+               foreach ($tableColumns as $tcol) {
                        $tcols[] = $tcol['Field'];
                }
                // remove inexistent columns
@@ -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)
        {
@@ -68,23 +66,21 @@ class UserImport
                }
 
                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::log("uimport: $query", Logger::TRACE);
 
                if (self::IMPORT_DEBUG) {
                        return true;
                }
 
-               return q($query);
+               return DBA::insert($table, $arr);
        }
 
        /**
         * @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)
        {