|
|
@ -48,7 +48,8 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p |
|
|
|
goaway(z_root()); |
|
|
|
} |
|
|
|
|
|
|
|
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", |
|
|
|
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
|
|
|
|
FROM `user` WHERE `uid` = %d LIMIT 1",
|
|
|
|
intval($_SESSION['uid']) |
|
|
|
); |
|
|
|
|
|
|
@ -183,7 +184,8 @@ else { |
|
|
|
|
|
|
|
// process normal login request
|
|
|
|
|
|
|
|
$r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' )
|
|
|
|
$r = q("SELECT `user`.*, `user`.`pubkey` as `upubkey`, `user`.`prvkey` as `uprvkey`
|
|
|
|
FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) |
|
|
|
AND `password` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1",
|
|
|
|
dbesc(trim($_POST['openid_url'])), |
|
|
|
dbesc(trim($_POST['openid_url'])), |
|
|
|