AutoInstall Test fix

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

diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index efd4bd2f8fea963872d79b467118be380903d7d1..7ccb6f80cbd7aa5d98ab7646b3a71bcf9f87bd16 100644 (file)
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,6 +5,8 @@
 namespace Friendica\Core;
 
 use Friendica\App;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
@@ -36,7 +38,7 @@ class UserImport
        private static function checkCols($table, &$arr)
        {
                $query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
-               logger("uimport: $query", LOGGER_DEBUG);
+               Logger::log("uimport: $query", Logger::DEBUG);
                $r = q($query);
                $tcols = [];
                // get a plain array of column names
@@ -67,7 +69,7 @@ class UserImport
                $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;
@@ -84,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
@@ -142,7 +144,7 @@ class UserImport
                // import user
                $r = self::dbImportAssoc('user', $account['user']);
                if ($r === false) {
-                       logger("uimport:insert user : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
+                       Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        notice(L10n::t("User creation error"));
                        return;
                }
@@ -160,7 +162,7 @@ class UserImport
                        $profile['uid'] = $newuid;
                        $r = self::dbImportAssoc('profile', $profile);
                        if ($r === false) {
-                               logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
+                               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]);
                                return;
@@ -179,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:
@@ -198,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_INFO);
+                               Logger::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                                $errorcount++;
                        } else {
                                $contact['newid'] = self::lastInsertId();
@@ -212,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_INFO);
+                               Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        } else {
                                $group['newid'] = self::lastInsertId();
                        }
@@ -237,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_INFO);
+                                       Logger::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                                }
                        }
                }
@@ -255,7 +257,7 @@ class UserImport
                        );
 
                        if ($r === false) {
-                               logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), LOGGER_INFO);
+                               Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        }
                }
 
@@ -263,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_INFO);
+                               Logger::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
                        }
                }
 
@@ -271,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');
        }
 }