diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-08-30 11:00:23 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-08-30 11:00:23 +0200 |
| commit | d0926240a87327a7e38b822802ac192336f68791 (patch) | |
| tree | 49c5d2eec9954efbe313e7130e1ce970a56c60e9 /include/auth.php | |
| parent | 97806544bcd7ee3831ffc515062afe0812828b76 (diff) | |
| parent | 0f1bc6e9571e367b37246e43ce08921bf317fa7c (diff) | |
| download | volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.tar.gz volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.tar.bz2 volse-hubzilla-d0926240a87327a7e38b822802ac192336f68791.zip | |
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'include/auth.php')
| -rw-r--r-- | include/auth.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/auth.php b/include/auth.php index 768af626f..b7b96bdc0 100644 --- a/include/auth.php +++ b/include/auth.php @@ -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'])), |