missing linebreaks and a small typo

[friendica.git] / include / uimport.php

diff --git a/include/uimport.php b/include/uimport.php
index eb971387fde449c0afaf4592172884d3878df376..78b20bd691fefe7694aab86948d74443aba59bc5 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -1,18 +1,17 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\System;
 
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
 
 function last_insert_id() {
-       global $db;
-
        if (IMPORT_DEBUG) {
                return 1;
        }
 
-       return $db->insert_id();
+       return dba::lastInsertId();
 }
 
 function last_error() {
@@ -63,16 +62,6 @@ function db_import_assoc($table, $arr) {
        return q($query);
 }
 
-function import_cleanup($newuid) {
-       q("DELETE FROM `user` WHERE uid = %d", $newuid);
-       q("DELETE FROM `contact` WHERE uid = %d", $newuid);
-       q("DELETE FROM `profile` WHERE uid = %d", $newuid);
-       q("DELETE FROM `photo` WHERE uid = %d", $newuid);
-       q("DELETE FROM `group` WHERE uid = %d", $newuid);
-       q("DELETE FROM `group_member` WHERE uid = %d", $newuid);
-       q("DELETE FROM `pconfig` WHERE uid = %d", $newuid);
-}
-
 /**
  * @brief Import account file exported from mod/uexport
  *
@@ -135,7 +124,7 @@ function import_account(App $a, $file) {
        }
 
        $oldbaseurl = $account['baseurl'];
-       $newbaseurl = App::get_baseurl();
+       $newbaseurl = System::baseUrl();
        $olduid = $account['user']['uid'];
 
        unset($account['user']['uid']);
@@ -174,7 +163,7 @@ function import_account(App $a, $file) {
                if ($r === false) {
                        logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
                        info(t("User profile creation error"));
-                       import_cleanup($newuid);
+                       dba::delete('user', array('uid' => $newuid));
                        return;
                }
        }
@@ -289,5 +278,5 @@ function import_account(App $a, $file) {
        proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid);
 
        info(t("Done. You can now login with your username and password"));
-       goaway(App::get_baseurl() . "/login");
+       goaway(System::baseUrl() . "/login");
 }