Quellcode durchsuchen

fix spacing
add message about OAuth

CauseFX vor 6 Jahren
Ursprung
Commit
cff3465a0a
2 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen
  1. 1 1
      api/functions/api-functions.php
  2. 1 0
      js/functions.js

+ 1 - 1
api/functions/api-functions.php

@@ -93,7 +93,7 @@ function login($array)
 		if($GLOBALS['authProxyEnabled'] && $GLOBALS['authProxyHeaderName'] !== '' && $GLOBALS['authProxyWhitelist'] !== ''){
 			if(isset(getallheaders()[$GLOBALS['authProxyHeaderName']])){
 				$usernameHeader = isset(getallheaders()[$GLOBALS['authProxyHeaderName']]) ? getallheaders()[$GLOBALS['authProxyHeaderName']] : $username;
-				writeLog('success', 'Auth Proxy Function - Starting Verification for IP: ' . userIP() . ' for request on: ' . $_SERVER['REMOTE_ADDR'] . 'against IP/Subnet: ' . $GLOBALS['authProxyWhitelist'], $usernameHeader);
+				writeLog('success', 'Auth Proxy Function - Starting Verification for IP: ' . userIP() . ' for request on: ' . $_SERVER['REMOTE_ADDR'] . ' against IP/Subnet: ' . $GLOBALS['authProxyWhitelist'], $usernameHeader);
 				$whitelistRange = analyzeIP($GLOBALS['authProxyWhitelist']);
 				$from = $whitelistRange['from'];
 				$to = $whitelistRange['to'];

+ 1 - 0
js/functions.js

@@ -7099,6 +7099,7 @@ function oAuthLoginNeededCheck() {
             return false;
         }
     }
+    message('OAuth', ' Proceeding to login', activeInfo.settings.notifications.position, '#FFF', 'info', '10000');
     organizrAPI('POST', 'api/?v1/login', '').success(function (data) {
         var html = JSON.parse(data);
         if (html.data == true) {