use Friendica\App;
use Friendica\Core\System;
+use Friendica\Core\PConfig;
require_once("include/Photo.php");
define("IMPORT_DEBUG", False);
return dba::lastInsertId();
}
-function last_error() {
- global $db;
- return $db->error;
-}
-
/**
* Remove columns from array $arr that aren't in table $table
*
// check for username
$r = q("SELECT uid FROM user WHERE nickname='%s'", $account['user']['nickname']);
if ($r === false) {
- logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
notice(t('Error! Cannot check nickname'));
return;
}
// check if username matches deleted account
$r = q("SELECT id FROM userd WHERE username='%s'", $account['user']['nickname']);
if ($r === false) {
- logger("uimport:check nickname : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
notice(t('Error! Cannot check nickname'));
return;
}
$oldaddr = str_replace('http://', '@', normalise_link($oldbaseurl));
$newaddr = str_replace('http://', '@', normalise_link($newbaseurl));
+ if (!empty($account['profile']['addr'])) {
+ $old_handle = $account['profile']['addr'];
+ } else {
+ $old_handle = $account['user']['nickname'].$oldaddr;
+ }
+
$olduid = $account['user']['uid'];
unset($account['user']['uid']);
$r = db_import_assoc('user', $account['user']);
if ($r === false) {
//echo "<pre>"; var_dump($r, $query, mysql_error()); killme();
- logger("uimport:insert user : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
notice(t("User creation error"));
return;
}
$newuid = last_insert_id();
//~ $newuid = 1;
+ PConfig::set($newuid, 'system', 'previous_addr', $old_handle);
+
// Generate a new guid for the account. Otherwise there will be problems with diaspora
q("UPDATE `user` SET `guid` = '%s' WHERE `uid` = %d",
dbesc(generate_user_guid()), intval($newuid));
$profile['uid'] = $newuid;
$r = db_import_assoc('profile', $profile);
if ($r === false) {
- logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
info(t("User profile creation error"));
dba::delete('user', array('uid' => $newuid));
return;
switch ($contact['network']) {
case NETWORK_DFRN:
+ case NETWORK_DIASPORA:
// send relocate message (below)
break;
case NETWORK_ZOT:
$contact['uid'] = $newuid;
$r = db_import_assoc('contact', $contact);
if ($r === false) {
- logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
$errorcount++;
} else {
$contact['newid'] = last_insert_id();
$group['uid'] = $newuid;
$r = db_import_assoc('group', $group);
if ($r === false) {
- logger("uimport:insert group " . $group['name'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
} else {
$group['newid'] = last_insert_id();
}
if ($import == 2) {
$r = db_import_assoc('group_member', $group_member);
if ($r === false) {
- logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert group member " . $group_member['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
}
}
}
);
if ($r === false) {
- logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
}
}
$pconfig['uid'] = $newuid;
$r = db_import_assoc('pconfig', $pconfig);
if ($r === false) {
- logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . last_error(), LOGGER_NORMAL);
+ logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
}
}