require_once('library/openid.php');
-function openid_content(&$a) {
+function openid_content(App &$a) {
$noid = get_config('system','no_openid');
if($noid)
if($openid->validate()) {
- #$authid = normalise_openid($_REQUEST['openid_identity']);
$authid = $_REQUEST['openid_identity'];
if(! strlen($authid)) {
// mod/settings.php in 8367cad so it might have left mixed
// records in the user table
//
- $r = q("SELECT `user`.*, `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",
+ $r = q("SELECT * 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($r && count($r)) {
+ if (dbm::is_result($r)) {
// successful OpenID login
$args .= '&openid_url=' . notags(trim($authid));
- goaway($a->get_baseurl() . '/register' . $args);
+ goaway(App::get_baseurl() . '/register' . $args);
// NOTREACHED
}