aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-10-17 16:53:59 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-10-17 16:53:59 +0200
commitde44072172b7f56345041358a0be275b482e474c (patch)
tree1298dbe93bae97687932e9ffe346350f42572ade /include
parent2116943964e0c10984976f6d38eba044e35f983a (diff)
downloadvolse-hubzilla-de44072172b7f56345041358a0be275b482e474c.tar.gz
volse-hubzilla-de44072172b7f56345041358a0be275b482e474c.tar.bz2
volse-hubzilla-de44072172b7f56345041358a0be275b482e474c.zip
works on login form
Diffstat (limited to 'include')
-rw-r--r--include/auth.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/include/auth.php b/include/auth.php
index 1f16b3504..45c71c66b 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -104,11 +104,12 @@ else {
if((x($_POST,'password')) && strlen($_POST['password']))
$encrypted = hash('whirlpool',trim($_POST['password']));
else {
- if((x($_POST,'openid_url')) && strlen($_POST['openid_url'])) {
+ if((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
+ (x($_POST,'username')) && strlen($_POST['username'])) {
$noid = get_config('system','no_openid');
- $openid_url = trim($_POST['openid_url']);
+ $openid_url = trim( (strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']) );
// validate_url alters the calling parameter
@@ -161,7 +162,7 @@ else {
$record = null;
$addon_auth = array(
- 'username' => trim($_POST['openid_url']),
+ 'username' => trim($_POST['username']),
'password' => trim($_POST['password']),
'authenticated' => 0,
'user_record' => null
@@ -187,8 +188,8 @@ else {
$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 `account_expired` = 0 AND `verified` = 1 LIMIT 1",
- dbesc(trim($_POST['openid_url'])),
- dbesc(trim($_POST['openid_url'])),
+ dbesc(trim($_POST['username'])),
+ dbesc(trim($_POST['username'])),
dbesc($encrypted)
);
if(count($r))
@@ -196,7 +197,7 @@ else {
}
if((! $record) || (! count($record))) {
- logger('authenticate: failed login attempt: ' . trim($_POST['openid_url']));
+ logger('authenticate: failed login attempt: ' . trim($_POST['username']));
notice( t('Login failed.') . EOL );
goaway(z_root());
}