X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FUserImport.php;h=fbc89ccf580ce0deed66a66dc9421c33bce321aa;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=59ab7af4aa832cdc7249c5c0bdccd4382b8d847e;hpb=7efde8e334d6ca52fd1608fb9a78babcea4bdc9f;p=friendica.git diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php index 59ab7af4aa..fbc89ccf58 100644 --- a/src/Core/UserImport.php +++ b/src/Core/UserImport.php @@ -1,20 +1,38 @@ . + * */ + namespace Friendica\Core; -use Friendica\App; -use Friendica\Core\Logger; -use Friendica\Core\Protocol; -use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\Database\DBStructure; +use Friendica\DI; use Friendica\Model\Photo; +use Friendica\Model\Profile; use Friendica\Object\Image; +use Friendica\Security\PermissionSet\Repository\PermissionSet; use Friendica\Util\Strings; +use Friendica\Worker\Delivery; /** - * @brief UserImport class + * UserImport class */ class UserImport { @@ -33,22 +51,29 @@ class UserImport * 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`", DBA::escape($table)); - Logger::log("uimport: $query", Logger::DEBUG); - $r = q($query); + $tableColumns = DBStructure::getColumns($table); + $tcols = []; + $ttype = []; // get a plain array of column names - foreach ($r as $tcol) { + foreach ($tableColumns as $tcol) { $tcols[] = $tcol['Field']; + $ttype[$tcol['Field']] = $tcol['Type']; } // remove inexistent columns foreach ($arr as $icol => $ival) { if (!in_array($icol, $tcols)) { unset($arr[$icol]); + continue; + } + + if ($ttype[$icol] === 'datetime') { + $arr[$icol] = $ival ?? DBA::NULL_DATETIME; } } } @@ -57,7 +82,9 @@ class UserImport * 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) { @@ -66,27 +93,24 @@ class UserImport } self::checkCols($table, $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::log("uimport: $query", Logger::TRACE); if (self::IMPORT_DEBUG) { return true; } - return q($query); + return DBA::insert($table, $arr); } /** - * @brief Import account file exported from mod/uexport + * Import account file exported from mod/uexport * - * @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) + public static function importAccount($file) { - Logger::log("Start user import from " . $file['tmp_name']); + Logger::notice("Start user import from " . $file['tmp_name']); /* STEPS 1. checks @@ -98,13 +122,13 @@ class UserImport $account = json_decode(file_get_contents($file['tmp_name']), true); if ($account === null) { - notice(L10n::t("Error decoding account file")); + notice(DI::l10n()->t("Error decoding account file")); return; } if (empty($account['version'])) { - notice(L10n::t("Error! No version data in file! This is not a Friendica account file?")); + notice(DI::l10n()->t("Error! No version data in file! This is not a Friendica account file?")); return; } @@ -112,12 +136,12 @@ class UserImport // check if username matches deleted account 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'])); + notice(DI::l10n()->t("User '%s' already exists on this server!", $account['user']['nickname'])); return; } $oldbaseurl = $account['baseurl']; - $newbaseurl = System::baseUrl(); + $newbaseurl = DI::baseUrl(); $oldaddr = str_replace('http://', '@', Strings::normaliseLink($oldbaseurl)); $newaddr = str_replace('http://', '@', Strings::normaliseLink($newbaseurl)); @@ -147,30 +171,13 @@ class UserImport // import user $r = self::dbImportAssoc('user', $account['user']); if ($r === false) { - Logger::log("uimport:insert user : ERROR : " . DBA::errorMessage(), Logger::INFO); - notice(L10n::t("User creation error")); + Logger::warning("uimport:insert user : ERROR : " . DBA::errorMessage()); + notice(DI::l10n()->t("User creation error")); return; } $newuid = self::lastInsertId(); - PConfig::set($newuid, 'system', 'previous_addr', $old_handle); - - foreach ($account['profile'] as &$profile) { - foreach ($profile as $k => &$v) { - $v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v); - foreach (["profile", "avatar"] as $k) { - $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v); - } - } - $profile['uid'] = $newuid; - $r = self::dbImportAssoc('profile', $profile); - if ($r === false) { - 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]); - return; - } - } + DI::pConfig()->set($newuid, 'system', 'previous_addr', $old_handle); $errorcount = 0; foreach ($account['contact'] as &$contact) { @@ -203,21 +210,21 @@ class UserImport $contact['uid'] = $newuid; $r = self::dbImportAssoc('contact', $contact); if ($r === false) { - Logger::log("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO); + Logger::warning("uimport:insert contact " . $contact['nick'] . "," . $contact['network'] . " : ERROR : " . DBA::errorMessage()); $errorcount++; } else { $contact['newid'] = self::lastInsertId(); } } if ($errorcount > 0) { - notice(L10n::tt("%d contact not imported", "%d contacts not imported", $errorcount)); + notice(DI::l10n()->tt("%d contact not imported", "%d contacts not imported", $errorcount)); } foreach ($account['group'] as &$group) { $group['uid'] = $newuid; $r = self::dbImportAssoc('group', $group); if ($r === false) { - Logger::log("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO); + Logger::warning("uimport:insert group " . $group['name'] . " : ERROR : " . DBA::errorMessage()); } else { $group['newid'] = self::lastInsertId(); } @@ -242,8 +249,49 @@ class UserImport if ($import == 2) { $r = self::dbImportAssoc('group_member', $group_member); if ($r === false) { - Logger::log("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO); + Logger::warning("uimport:insert group member " . $group_member['id'] . " : ERROR : " . DBA::errorMessage()); + } + } + } + + foreach ($account['profile'] as &$profile) { + unset($profile['id']); + $profile['uid'] = $newuid; + + foreach ($profile as $k => &$v) { + $v = str_replace([$oldbaseurl, $oldaddr], [$newbaseurl, $newaddr], $v); + foreach (["profile", "avatar"] as $k) { + $v = str_replace($oldbaseurl . "/photo/" . $k . "/" . $olduid . ".jpg", $newbaseurl . "/photo/" . $k . "/" . $newuid . ".jpg", $v); + } + } + + if (count($account['profile']) === 1 || $profile['is-default']) { + $r = self::dbImportAssoc('profile', $profile); + + if ($r === false) { + Logger::warning("uimport:insert profile: ERROR : " . DBA::errorMessage()); + notice(DI::l10n()->t("User profile creation error")); + DBA::delete('user', ['uid' => $newuid]); + DBA::delete('profile_field', ['uid' => $newuid]); + return; } + + $profile['id'] = DBA::lastInsertId(); + } + + Profile::migrate($profile); + } + + $permissionSet = DI::permissionSet()->selectDefaultForUser($newuid); + + foreach ($account['profile_fields'] ?? [] as $profile_field) { + $profile_field['uid'] = $newuid; + + ///@TODO Replace with permissionset import + $profile_field['psid'] = $profile_field['psid'] ? $permissionSet->uid : PermissionSet::PUBLIC; + + if (self::dbImportAssoc('profile_field', $profile_field) === false) { + Logger::info("uimport:insert profile field " . $profile_field['id'] . " : ERROR : " . DBA::errorMessage()); } } @@ -260,7 +308,7 @@ class UserImport ); if ($r === false) { - Logger::log("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO); + Logger::warning("uimport:insert photo " . $photo['resource-id'] . "," . $photo['scale'] . " : ERROR : " . DBA::errorMessage()); } } @@ -268,14 +316,14 @@ class UserImport $pconfig['uid'] = $newuid; $r = self::dbImportAssoc('pconfig', $pconfig); if ($r === false) { - Logger::log("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage(), Logger::INFO); + Logger::warning("uimport:insert pconfig " . $pconfig['id'] . " : ERROR : " . DBA::errorMessage()); } } // send relocate messages - Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $newuid); + Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::RELOCATION, $newuid); - info(L10n::t("Done. You can now login with your username and password")); - $a->internalRedirect('login'); + info(DI::l10n()->t("Done. You can now login with your username and password")); + DI::baseUrl()->redirect('login'); } }