AutoInstall Test fix

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 801deda0af2c26c453bc417fb473167937c392d8..7ccb6f80cbd7aa5d98ab7646b3a71bcf9f87bd16 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,14 +5,11 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
-use Friendica\Core\PConfig;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
-use dba;
 
 require_once "include/dba.php";
 
@@ -29,7 +26,7 @@ class UserImport
                        return 1;
                }
 
-               return dba::lastInsertId();
+               return DBA::lastInsertId();
        }
 
        /**
@@ -40,8 +37,8 @@ class UserImport
         */
        private static function checkCols($table, &$arr)
        {
-               $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
-               logger("uimport: $query", LOGGER_DEBUG);
+               $query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
+               Logger::log("uimport: $query", Logger::DEBUG);
                $r = q($query);
                $tcols = [];
                // get a plain array of column names
@@ -69,10 +66,10 @@ 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);
+               Logger::log("uimport: $query", Logger::TRACE);
 
                if (self::IMPORT_DEBUG) {
                        return true;
@@ -89,7 +86,7 @@ class UserImport
         */
        public static function importAccount(App $a, $file)
        {
-               logger("Start user import from " . $file['tmp_name']);
+               Logger::log("Start user import from " . $file['tmp_name']);
                /*
                STEPS
                1. checks
@@ -113,8 +110,8 @@ class UserImport
 
                // check for username
                // check if username matches deleted account
-               if (dba::exists('user', ['nickname' => $account['user']['nickname']])
-                       || dba::exists('userd', ['nickname' => $account['user']['nickname']])) {
+               if (DBA::exists('user', ['nickname' => $account['user']['nickname']])
+                       || DBA::exists('userd', ['username' => $account['user']['nickname']])) {
                        notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
                        return;
                }
@@ -147,7 +144,7 @@ class UserImport
                // import user
                $r = self::dbImportAssoc('user', $account['user']);
                if ($r === false) {
-                       logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                       Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        notice(L10n::t("User creation error"));
                        return;
                }
@@ -165,9 +162,9 @@ class UserImport
                        $profile['uid'] = $newuid;
                        $r = self::dbImportAssoc('profile', $profile);
                        if ($r === false) {
-                               logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               Logger::log("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                                info(L10n::t("User profile creation error"));
-                               dba::delete('user', ['uid' => $newuid]);
+                               DBA::delete('user', ['uid' => $newuid]);
                                return;
                        }
                }
@@ -184,15 +181,15 @@ class UserImport
                        }
                        if ($contact['uid'] == $olduid && $contact['self'] == '0') {
                                // set contacts 'avatar-date' to NULL_DATE to let worker to update urls
-                               $contact["avatar-date"] = NULL_DATE;
+                               $contact["avatar-date"] = DBA::NULL_DATETIME;
 
                                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:
@@ -203,7 +200,7 @@ class UserImport
                        $contact['uid'] = $newuid;
                        $r = self::dbImportAssoc('contact', $contact);
                        if ($r === false) {
-                               logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               Logger::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                                $errorcount++;
                        } else {
                                $contact['newid'] = self::lastInsertId();
@@ -217,7 +214,7 @@ class UserImport
                        $group['uid'] = $newuid;
                        $r = self::dbImportAssoc('group', $group);
                        if ($r === false) {
-                               logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        } else {
                                $group['newid'] = self::lastInsertId();
                        }
@@ -242,7 +239,7 @@ class UserImport
                        if ($import == 2) {
                                $r = self::dbImportAssoc('group_member', $group_member);
                                if ($r === false) {
-                                       logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                                       Logger::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                                }
                        }
                }
@@ -260,7 +257,7 @@ class UserImport
                        );
 
                        if ($r === false) {
-                               logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        }
                }
 
@@ -268,7 +265,7 @@ class UserImport
                        $pconfig['uid'] = $newuid;
                        $r = self::dbImportAssoc('pconfig', $pconfig);
                        if ($r === false) {
-                               logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+                               Logger::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        }
                }
 
@@ -276,6 +273,6 @@ class UserImport
                Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid);
 
                info(L10n::t("Done. You can now login with your username and password"));
-               goaway(System::baseUrl() . "/login");
+               $a->internalRedirect('login');
        }
 }