diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 17:55:40 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 17:55:40 -0700 |
| commit | 3affb2e8172b4cc673aafe9551c21dad6f606d87 (patch) | |
| tree | 446d143aa2b47b8fd710b5a4920ee63196b8fe34 /include/api_auth.php | |
| parent | d54ad9880252cf8c6d2c61a01680279741735a36 (diff) | |
| download | volse-hubzilla-3affb2e8172b4cc673aafe9551c21dad6f606d87.tar.gz volse-hubzilla-3affb2e8172b4cc673aafe9551c21dad6f606d87.tar.bz2 volse-hubzilla-3affb2e8172b4cc673aafe9551c21dad6f606d87.zip | |
sort out some of the authentication mess - with luck this may fix the DAV auth issue which I simply could not duplicate or find a reason for.
Diffstat (limited to 'include/api_auth.php')
| -rw-r--r-- | include/api_auth.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/api_auth.php b/include/api_auth.php index dc8492b20..7a71bad73 100644 --- a/include/api_auth.php +++ b/include/api_auth.php @@ -59,20 +59,12 @@ function api_login(&$a){ if(isset($_SERVER['PHP_AUTH_USER'])) { $channel_login = 0; $record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']); - if(! $record) { - $r = q("select * from channel left join account on account.account_id = channel.channel_account_id - where channel.channel_address = '%s' limit 1", - dbesc($_SERVER['PHP_AUTH_USER']) - ); - if ($r) { - $record = account_verify_password($r[0]['account_email'],$_SERVER['PHP_AUTH_PW']); - if($record) - $channel_login = $r[0]['channel_id']; - } + if($record && $record['channel']) { + $channel_login = $record['channel']['channel_id']; } } - if($record) { + if($record['account']) { authenticate_success($record); if($channel_login) |