clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add dba::exists usages to UserImport::importAccount

This commit is contained in:
Hypolite Petovan 2018-02-11 19:28:39 -05:00
parent 30e8361dcb
commit 1d035ae2ae
1 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Core/UserImport.php
View File

@ -112,27 +112,9 @@ class UserImport
} }
// check for username // check for username
$r = dba::selectFirst('user', ['uid'], ['nickname' => $account['user']['nickname']]);
if ($r === false) {
logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
notice(L10n::t('Error! Cannot check nickname'));
return;
}
if (DBM::is_result($r) > 0) {
notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
return;
}
// check if username matches deleted account // check if username matches deleted account
$r = dba::selectFirst('userd', ['id'], ['username' => $account['user']['nickname']]); if (dba::exists('user', ['nickname' => $account['user']['nickname']])
if ($r === false) { || dba::exists('userd', ['nickname' => $account['user']['nickname']])) {
logger("uimport:check nickname : ERROR : " . dba::errorMessage(), LOGGER_NORMAL);
notice(L10n::t('Error! Cannot check nickname'));
return;
}
if (DBM::is_result($r) > 0) {
notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname'])); notice(L10n::t("User '%s' already exists on this server!", $account['user']['nickname']));
return; return;
} }