Merge pull request #5667 from miqrogroove/patch-1

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index f0aee13405fd1c8a455be6639ccba2a52f90c8f6..e62084049e3240baed70bd218babf683686f048f 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,6 +5,7 @@
 namespace Friendica\Core;
 
 use Friendica\App;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
@@ -35,7 +36,7 @@ class UserImport
         */
        private static function checkCols($table, &$arr)
        {
-               $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
+               $query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
                logger("uimport: $query", LOGGER_DEBUG);
                $r = q($query);
                $tcols = [];
@@ -64,8 +65,8 @@ class UserImport
                }
 
                self::checkCols($table, $arr);
-               $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
-               $vals = implode("','", array_map('dbesc', array_values($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("uimport: $query", LOGGER_TRACE);
 
@@ -182,12 +183,12 @@ class UserImport
                                $contact["avatar-date"] = NULL_DATE;
 
                                switch ($contact['network']) {
-                                       case NETWORK_DFRN:
-                                       case NETWORK_DIASPORA:
+                                       case Protocol::DFRN:
+                                       case Protocol::DIASPORA:
                                                //  send relocate message (below)
                                                break;
-                                       case NETWORK_FEED:
-                                       case NETWORK_MAIL:
+                                       case Protocol::FEED:
+                                       case Protocol::MAIL:
                                                // Nothing to do
                                                break;
                                        default: