X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fuimport.php;h=0d9ffc35fca2f001fcf6df23db1f03a1e8fd8da5;hb=c2213760412f6d178d77451d69ae467534042457;hp=b8439ee0944c8192fec2557134db68c234f09bcb;hpb=9eca83e29c6f292ab4d95d90789df06bf8d04d34;p=friendica.git

diff --git a/include/uimport.php b/include/uimport.php
index b8439ee094..0d9ffc35fc 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -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']);
@@ -157,7 +157,8 @@ function import_account(&$a, $file) {
 	//~ $newuid = 1;
 
 	// Generate a new guid for the account. Otherwise there will be problems with diaspora
-	q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d", generate_user_guid(), $newuid);
+	q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
+		dbesc(generate_user_guid()), intval($newuid));
 
 	foreach ($account['profile'] as &$profile) {
 		foreach ($profile as $k => &$v) {
@@ -194,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:
@@ -286,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");
 }