- $r = q("SELECT *, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey` FROM `user`
- WHERE ( `openid` = '%s' OR `openid` = '%s' )
- AND `blocked` = 0 AND `account_expired` = 0
- AND `account_removed` = 0 AND `verified` = 1
- LIMIT 1",
- dbesc($authid), dbesc(normalise_openid($authid))
- );
-
- if (DBM::is_result($r)) {
+ $condition = ['blocked' => false, 'account_expired' => false, 'account_removed' => false, 'verified' => true,
+ 'openid' => [$authid, Strings::normaliseOpenID($authid)]];
+ $user = DBA::selectFirst('user', [], $condition);
+ if (DBA::isResult($user)) {