Merge pull request #8075 from annando/html-escaping

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 1e103c1f5df8451c1614e942cea8030d399436f3..fdacd2b2bf484bb8bb52128d0f906e549ee7dcf7 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -6,9 +6,12 @@ namespace Friendica\Core;
 
 use Friendica\App;
 use Friendica\Database\DBA;
+use Friendica\Database\DBStructure;
+use Friendica\DI;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Strings;
+use Friendica\Worker\Delivery;
 
 /**
  * @brief UserImport class
@@ -35,18 +38,24 @@ class UserImport
         */
        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 = [];
+               $ttype = [];
                // get a plain array of column names
-               foreach ($r as $tcol) {
+               foreach ($tableColumns as $tcol) {
                        $tcols[] = $tcol['Field'];
+                       $ttype[$tcol['Field']] = $tcol['Type'];
                }
                // remove inexistent columns
                foreach ($arr as $icol => $ival) {
                        if (!in_array($icol, $tcols)) {
                                unset($arr[$icol]);
+                               continue;
+                       }
+
+                       if ($ttype[$icol] === 'datetime') {
+                               $arr[$icol] = $ival ?? DBA::NULL_DATETIME;
                        }
                }
        }
@@ -66,27 +75,22 @@ 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 array $file array from $_FILES
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public static function importAccount(App $a, $file)
+       public static function importAccount($file)
        {
                Logger::log("Start user import from " . $file['tmp_name']);
                /*
@@ -119,7 +123,7 @@ class UserImport
                }
 
                $oldbaseurl = $account['baseurl'];
-               $newbaseurl = System::baseUrl();
+               $newbaseurl = DI::baseUrl();
 
                $oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl));
                $newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl));
@@ -275,9 +279,9 @@ class UserImport
                }
 
                // send relocate messages
-               Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
+               Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $newuid);
 
                info(L10n::t("Done. You can now login with your username and password"));
-               $a->internalRedirect('login');
+               DI::baseUrl()->redirect('login');
        }
 }