namespace Friendica\Core;
use Friendica\App;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
use Friendica\Model\Photo;
use Friendica\Object\Image;
-
-require_once "include/dba.php";
+use Friendica\Util\Strings;
/**
* @brief UserImport class
return 1;
}
- return dba::lastInsertId();
+ return DBA::lastInsertId();
}
/**
* Remove columns from array $arr that aren't in table $table
*
* @param string $table Table name
- * @param array &$arr Column=>Value array from json (by ref)
+ * @param array &$arr Column=>Value array from json (by ref)
+ * @throws \Exception
*/
private static function checkCols($table, &$arr)
{
- $query = sprintf("SHOW COLUMNS IN `%s`", dbesc($table));
- logger("uimport: $query", LOGGER_DEBUG);
+ $query = sprintf("SHOW COLUMNS IN `%s`", DBA::escape($table));
+ Logger::log("uimport: $query", Logger::DEBUG);
$r = q($query);
$tcols = [];
// get a plain array of column names
* Import data into table $table
*
* @param string $table Table name
- * @param array $arr Column=>Value array from json
+ * @param array $arr Column=>Value array from json
+ * @return array|bool
+ * @throws \Exception
*/
private static function dbImportAssoc($table, $arr)
{
}
self::checkCols($table, $arr);
- $cols = implode("`,`", array_map('dbesc', array_keys($arr)));
- $vals = implode("','", array_map('dbesc', array_values($arr)));
+ $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;
/**
* @brief Import account file exported from mod/uexport
*
- * @param App $a Friendica App Class
+ * @param App $a Friendica App Class
* @param array $file array from $_FILES
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
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
}
- if (!x($account, 'version')) {
+ if (empty($account['version'])) {
notice(L10n::t("Error! No version data in file! This is not a Friendica account file?"));
return;
}
// check for username
// check if username matches deleted account
- if (dba::exists('user', ['nickname' => $account['user']['nickname']])
- || dba::exists('userd', ['username' => $account['user']['nickname']])) {
+ if (DBA::exists('user', ['nickname' => $account['user']['nickname']])
+ || DBA::exists('userd', ['username' => $account['user']['nickname']])) {
notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
return;
}
$oldbaseurl = $account['baseurl'];
$newbaseurl = System::baseUrl();
- $oldaddr = str_replace('http://', '@', normalise_link($oldbaseurl));
- $newaddr = str_replace('http://', '@', normalise_link($newbaseurl));
+ $oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl));
+ $newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl));
if (!empty($account['profile']['addr'])) {
$old_handle = $account['profile']['addr'];
$old_handle = $account['user']['nickname'].$oldaddr;
}
+ // Creating a new guid to avoid problems with Diaspora
+ $account['user']['guid'] = System::createUUID();
+
$olduid = $account['user']['uid'];
unset($account['user']['uid']);
// import user
$r = self::dbImportAssoc('user', $account['user']);
if ($r === false) {
- logger("uimport:insert user : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+ Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO);
notice(L10n::t("User creation error"));
return;
}
$profile['uid'] = $newuid;
$r = self::dbImportAssoc('profile', $profile);
if ($r === false) {
- logger("uimport:insert profile " . $profile['profile-name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+ 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]);
+ DBA::delete('user', ['uid' => $newuid]);
return;
}
}
}
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:
$contact['uid'] = $newuid;
$r = self::dbImportAssoc('contact', $contact);
if ($r === false) {
- logger("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+ Logger::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
$errorcount++;
} else {
$contact['newid'] = self::lastInsertId();
$group['uid'] = $newuid;
$r = self::dbImportAssoc('group', $group);
if ($r === false) {
- logger("uimport:insert group " . $group['name'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+ Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
} else {
$group['newid'] = self::lastInsertId();
}
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_NORMAL);
+ Logger::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
}
}
}
);
if ($r === false) {
- logger("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+ Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
}
}
$pconfig['uid'] = $newuid;
$r = self::dbImportAssoc('pconfig', $pconfig);
if ($r === false) {
- logger("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
+ Logger::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO);
}
}
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');
}
}
projects / friendica.git / blobdiff