@@ -700,20 +700,20 @@ |
||
700 | 700 | && $SETTINGS['maintenance_mode'] === '1') |
701 | 701 | ) { |
702 | 702 | if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) { |
703 | - $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0]; |
|
704 | - } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) { |
|
705 | - $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1]; |
|
706 | - } else { |
|
707 | - $username = $_SERVER['PHP_AUTH_USER']; |
|
708 | - } |
|
709 | - echo ' |
|
703 | + $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0]; |
|
704 | + } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) { |
|
705 | + $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1]; |
|
706 | + } else { |
|
707 | + $username = $_SERVER['PHP_AUTH_USER']; |
|
708 | + } |
|
709 | + echo ' |
|
710 | 710 | <div style="margin-bottom:3px;"> |
711 | 711 | <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label> |
712 | 712 | <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="' , $username , '" readonly /> |
713 | 713 | <span id="login_check_wait" style="display:none; float:right;"><i class="fa fa-cog fa-spin fa-1x"></i></span> |
714 | 714 | </div>'; |
715 | - } else { |
|
716 | - echo ' |
|
715 | + } else { |
|
716 | + echo ' |
|
717 | 717 | <div style="margin-bottom:3px;"> |
718 | 718 | <label for="login" class="form_label">', isset($SETTINGS['custom_login_text']) && !empty($SETTINGS['custom_login_text']) ? (string) $SETTINGS['custom_login_text'] : $LANG['index_login'], '</label> |
719 | 719 | <input type="text" size="10" id="login" name="login" class="input_text text ui-widget-content ui-corner-all" value="', empty($post_login) === false ? $post_login : '', '" /> |
@@ -321,26 +321,26 @@ |
||
321 | 321 | $dataReceived = prepareExchangedData($sentData, "decode"); |
322 | 322 | |
323 | 323 | // prepare variables |
324 | - if (isset($SETTINGS['enable_http_request_login']) === true |
|
324 | + if (isset($SETTINGS['enable_http_request_login']) === true |
|
325 | 325 | && $SETTINGS['enable_http_request_login'] === '1' |
326 | 326 | && isset($_SERVER['PHP_AUTH_USER']) === true |
327 | 327 | && !(isset($SETTINGS['maintenance_mode']) === true |
328 | 328 | && $SETTINGS['maintenance_mode'] === '1') |
329 | 329 | ) { |
330 | 330 | if (strpos($_SERVER['PHP_AUTH_USER'], '@') !== false) { |
331 | - $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0]; |
|
332 | - } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) { |
|
333 | - $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1]; |
|
334 | - } else { |
|
335 | - $username = $_SERVER['PHP_AUTH_USER']; |
|
336 | - } |
|
337 | - $passwordClear = $_SERVER['PHP_AUTH_PW']; |
|
338 | - $pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']); |
|
339 | - }else{ |
|
340 | - $passwordClear = htmlspecialchars_decode($dataReceived['pw']); |
|
341 | - $pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw'])); |
|
342 | - $username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login'])); |
|
343 | - } |
|
331 | + $username = explode("@", $_SERVER['PHP_AUTH_USER'])[0]; |
|
332 | + } elseif (strpos($_SERVER['PHP_AUTH_USER'], '\\') !== false) { |
|
333 | + $username = explode("\\", $_SERVER['PHP_AUTH_USER'])[1]; |
|
334 | + } else { |
|
335 | + $username = $_SERVER['PHP_AUTH_USER']; |
|
336 | + } |
|
337 | + $passwordClear = $_SERVER['PHP_AUTH_PW']; |
|
338 | + $pwdOldEncryption = encryptOld($_SERVER['PHP_AUTH_PW']); |
|
339 | + }else{ |
|
340 | + $passwordClear = htmlspecialchars_decode($dataReceived['pw']); |
|
341 | + $pwdOldEncryption = encryptOld(htmlspecialchars_decode($dataReceived['pw'])); |
|
342 | + $username = $antiXss->xss_clean(htmlspecialchars_decode($dataReceived['login'])); |
|
343 | + } |
|
344 | 344 | $logError = ""; |
345 | 345 | $userPasswordVerified = false; |
346 | 346 |