MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #4180 from annando/xmpp-auto-auth

Browse source 
The internal authentication for XMPP does work again
This commit is contained in:
Hypolite Petovan 2018-01-06 19:59:13 -05:00 committed by GitHub
parent 76933a106c f7d3ba26c8
commit 380e85e0c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Util/ExAuth.php
View file

@ -228,8 +228,9 @@ class ExAuth
$aUser = dba::select('user', ['uid', 'password'], ['nickname' => $sUser], ['limit' => 1]); $aUser = dba::select('user', ['uid', 'password'], ['nickname' => $sUser], ['limit' => 1]);
if (DBM::is_result($aUser)) { if (DBM::is_result($aUser)) {
$uid = User::authenticate($aUser, $aCommand[3]); $uid = $aUser['uid'];
$Error = $uid === false; $success = User::authenticate($aUser, $aCommand[3]);
$Error = $success === false;
} else { } else {
$this->writeLog(LOG_WARNING, 'user not found: ' . $sUser); $this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);
$Error = true; $Error = true;