harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zat URL auth updated to match changes to the atoken_login interface

Browse Source
This commit is contained in:
redmatrix 2016-07-21 20:04:30 -07:00
parent 8566f91303
commit bc46f70a90
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/auth.php
View File

@ -16,16 +16,24 @@ require_once('include/security.php');
/** /**
* @brief Verify login credentials. * @brief Verify login credentials.
* *
* If system <i>authlog</i> is set a log entry will be added for failed login * If system.authlog is set a log entry will be added for failed login
* attempts. * attempts.
* *
* @param string $email * @param string $login
* The login to verify (channel address, account email or guest login token). * The login to verify (channel address, account email or guest login token).
* @param string $pass * @param string $pass
* The provided password to verify. * The provided password to verify.
* @return array|null * @return array|null
* Returns account record on success, null on failure. * Returns account record on success, null on failure.
* The return array is dependent on the login mechanism.
* $ret['account'] will be set if either an email or channel address validation was successful (local login).
* $ret['channel'] will be set if a channel address validation was successful.
* $ret['xchan'] will be set if a guest access token validation was successful.
* Keys will exist for invalid return arrays but will be set to null.
* This function does not perform a login. It merely validates systems passwords and tokens.
*
*/ */
function account_verify_password($login, $pass) { function account_verify_password($login, $pass) {
$ret = [ 'account' => null, 'channel' => null, 'xchan' => null ]; $ret = [ 'account' => null, 'channel' => null, 'xchan' => null ];

3
include/channel.php
View File

@ -1371,7 +1371,8 @@ function zat_init() {
dbesc($_REQUEST['zat']) dbesc($_REQUEST['zat'])
); );
if($r) { if($r) {
atoken_login($r[0]); $xchan = atoken_xchan($r[0]);
atoken_login($xchan);
} }
} }