X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fuimport.php;h=b774d78c6d6e5578060e541833d75e8e09add95d;hb=3af099298c83b45f2f21cb5b81a8c7b6159e7459;hp=78471af1514461d33cdef9a13f7b1e5bd31503e8;hpb=4663df5b2b2177022dab638f387b2c96a59147f9;p=friendica.git diff --git a/include/uimport.php b/include/uimport.php index 78471af151..b774d78c6d 100644 --- a/include/uimport.php +++ b/include/uimport.php @@ -78,7 +78,7 @@ function import_cleanup($newuid) { q("DELETE FROM `pconfig` WHERE uid = %d", $newuid); } -function import_account(&$a, $file) { +function import_account(App $a, $file) { logger("Start user import from " . $file['tmp_name']); /* STEPS @@ -116,7 +116,7 @@ function import_account(&$a, $file) { notice(t('Error! Cannot check nickname')); return; } - if (count($r) > 0) { + if (dbm::is_result($r) > 0) { notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname'])); return; } @@ -127,13 +127,13 @@ function import_account(&$a, $file) { notice(t('Error! Cannot check nickname')); return; } - if (count($r) > 0) { + if (dbm::is_result($r) > 0) { notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname'])); return; } $oldbaseurl = $account['baseurl']; - $newbaseurl = $a->get_baseurl(); + $newbaseurl = App::get_baseurl(); $olduid = $account['user']['uid']; unset($account['user']['uid']); @@ -195,10 +195,10 @@ function import_account(&$a, $file) { // send relocate message (below) break; case NETWORK_ZOT: - // TODO handle zot network + /// @TODO handle zot network break; case NETWORK_MAIL2: - // TODO ? + /// @TODO ? break; case NETWORK_FEED: case NETWORK_MAIL: @@ -287,8 +287,8 @@ function import_account(&$a, $file) { } // send relocate messages - proc_run('php', 'include/notifier.php', 'relocate', $newuid); + proc_run(PRIORITY_HIGH, 'include/notifier.php', 'relocate', $newuid); info(t("Done. You can now login with your username and password")); - goaway($a->get_baseurl() . "/login"); + goaway(App::get_baseurl() . "/login"); }