[Web] Minor fix
parent
e13bc242a4
commit
514340b2a7
|
@ -812,12 +812,6 @@ function check_login($user, $pass, $app_passwd_data = false) {
|
||||||
global $redis;
|
global $redis;
|
||||||
global $imap_server;
|
global $imap_server;
|
||||||
|
|
||||||
if ($app_passwd_data === false) {
|
|
||||||
$app_passwd_data['eas'] = false;
|
|
||||||
$app_passwd_data['dav'] = false;
|
|
||||||
$app_passwd_data['proxyauth'] = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!filter_var($user, FILTER_VALIDATE_EMAIL) && !ctype_alnum(str_replace(array('_', '.', '-'), '', $user))) {
|
if (!filter_var($user, FILTER_VALIDATE_EMAIL) && !ctype_alnum(str_replace(array('_', '.', '-'), '', $user))) {
|
||||||
$_SESSION['return'][] = array(
|
$_SESSION['return'][] = array(
|
||||||
'type' => 'danger',
|
'type' => 'danger',
|
||||||
|
@ -943,8 +937,8 @@ function check_login($user, $pass, $app_passwd_data = false) {
|
||||||
'log' => array(__FUNCTION__, $user, '*'),
|
'log' => array(__FUNCTION__, $user, '*'),
|
||||||
'msg' => array('logged_in_as', $user)
|
'msg' => array('logged_in_as', $user)
|
||||||
);
|
);
|
||||||
if ($app_passwd_data['proxyauth'] === true) {
|
if ($app_passwd_data['eas'] === true || $app_passwd_data['dav'] === true) {
|
||||||
$service = ($app_passwd_data['eas'] === true) ? 'EAS' : (($app_passwd_data['dav'] === true) ? 'DAV' : 'SSO');
|
$service = ($app_passwd_data['eas'] === true) ? 'EAS' : 'DAV';
|
||||||
$stmt = $pdo->prepare("REPLACE INTO sasl_log (`service`, `app_password`, `username`, `real_rip`) VALUES (:service, :app_id, :username, :remote_addr)");
|
$stmt = $pdo->prepare("REPLACE INTO sasl_log (`service`, `app_password`, `username`, `real_rip`) VALUES (:service, :app_id, :username, :remote_addr)");
|
||||||
$stmt->execute(array(
|
$stmt->execute(array(
|
||||||
':service' => $service,
|
':service' => $service,
|
||||||
|
|
|
@ -23,7 +23,7 @@ if (isset($_SERVER['PHP_AUTH_USER'])) {
|
||||||
elseif (preg_match('/^(\/SOGo|)\/Microsoft-Server-ActiveSync.*/', $original_uri) === 1) {
|
elseif (preg_match('/^(\/SOGo|)\/Microsoft-Server-ActiveSync.*/', $original_uri) === 1) {
|
||||||
$is_eas = true;
|
$is_eas = true;
|
||||||
}
|
}
|
||||||
$login_check = check_login($username, $password, array('dav' => $is_dav, 'eas' => $is_eas, 'proxyauth' => true));
|
$login_check = check_login($username, $password, array('dav' => $is_dav, 'eas' => $is_eas));
|
||||||
if ($login_check === 'user') {
|
if ($login_check === 'user') {
|
||||||
header("X-User: $username");
|
header("X-User: $username");
|
||||||
header("X-Auth: Basic ".base64_encode("$username:$password"));
|
header("X-Auth: Basic ".base64_encode("$username:$password"));
|
||||||
|
|
Loading…
Reference in New Issue