lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

(captiveportal, new) psr style fix

Browse Source
This commit is contained in:
Ad Schellevis 2015-10-12 21:05:21 +02:00
parent 86388566c5
commit e508d11f6f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/opnsense/mvc/app/controllers/OPNsense/CaptivePortal/Api/AccessController.php
View File

@ -72,15 +72,17 @@ class AccessController extends ApiControllerBase
*/
private function getClientIp()
{
// determine orginal sender of this request
$trusted_proxy = array("127.0.0.1");
if ($this->request->getHeader('X-Forwarded-For') != "" && in_array($this->request->getClientAddress(), $trusted_proxy) ) {
// use X-Forwarded-For header to determine real client
return $this->request->getHeader('X-Forwarded-For');
} else {
// client accesses the Api directly
return $this->request->getClientAddress();
}
// determine orginal sender of this request
$trusted_proxy = array("127.0.0.1");
if ($this->request->getHeader('X-Forwarded-For') != "" &&
in_array($this->request->getClientAddress(), $trusted_proxy)
) {
// use X-Forwarded-For header to determine real client
return $this->request->getHeader('X-Forwarded-For');
} else {
// client accesses the Api directly
return $this->request->getClientAddress();
}
}
/**
@ -146,11 +148,13 @@ class AccessController extends ApiControllerBase
$backend = new Backend();
$CPsession = $backend->configdpRun(
"captiveportal allow",
array((string)$cpZone->zoneid,
array(
(string)$cpZone->zoneid,
$userName,
$clientIp,
$authServerName,
'json')
'json'
)
);
$CPsession = json_decode($CPsession, true);
if ($CPsession != null) {
@ -160,12 +164,12 @@ class AccessController extends ApiControllerBase
}
}
} else {
return array("clientState" => 'NOT_AUTHORIZED',"ipAddress" => $clientIp);
return array("clientState" => 'NOT_AUTHORIZED', "ipAddress" => $clientIp);
}
}
}
return array("clientState" => 'UNKNOWN',"ipAddress" => $clientIp);
return array("clientState" => 'UNKNOWN', "ipAddress" => $clientIp);
}
@ -187,7 +191,7 @@ class AccessController extends ApiControllerBase
$backend = new Backend();
$statusRAW = $backend->configdpRun(
"captiveportal disconnect",
array($zoneid, $clientSession['sessionId'], 'json')
array($zoneid, $clientSession['sessionId'], 'json')
);
$status = json_decode($statusRAW, true);
if ($status != null) {