@@ -217,46 +217,46 @@ |
||
217 | 217 | return php_sapi_name(); |
218 | 218 | } |
219 | 219 | |
220 | - /** |
|
221 | - * Returns the client IP address which originated this request. |
|
222 | - * Lifted and modified from SilverStripe 3's SS_HTTPRequest. |
|
223 | - * |
|
224 | - * @return string |
|
225 | - */ |
|
226 | - public function getIP() |
|
220 | + /** |
|
221 | + * Returns the client IP address which originated this request. |
|
222 | + * Lifted and modified from SilverStripe 3's SS_HTTPRequest. |
|
223 | + * |
|
224 | + * @return string |
|
225 | + */ |
|
226 | + public function getIP() |
|
227 | 227 | { |
228 | - $headerOverrideIP = null; |
|
228 | + $headerOverrideIP = null; |
|
229 | 229 | |
230 | - if(defined('TRUSTED_PROXY')) { |
|
231 | - $headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ? |
|
230 | + if(defined('TRUSTED_PROXY')) { |
|
231 | + $headers = (defined('SS_TRUSTED_PROXY_IP_HEADER')) ? |
|
232 | 232 | array(SS_TRUSTED_PROXY_IP_HEADER) : |
233 | 233 | null; |
234 | 234 | |
235 | - if(!$headers) { |
|
236 | - // Backwards compatible defaults |
|
237 | - $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR']; |
|
238 | - } |
|
235 | + if(!$headers) { |
|
236 | + // Backwards compatible defaults |
|
237 | + $headers = ['HTTP_CLIENT_IP', 'HTTP_X_FORWARDED_FOR']; |
|
238 | + } |
|
239 | 239 | |
240 | - foreach($headers as $header) { |
|
241 | - if(!empty($_SERVER[$header])) { |
|
242 | - $headerOverrideIP = $_SERVER[$header]; |
|
240 | + foreach($headers as $header) { |
|
241 | + if(!empty($_SERVER[$header])) { |
|
242 | + $headerOverrideIP = $_SERVER[$header]; |
|
243 | 243 | |
244 | - break; |
|
245 | - } |
|
246 | - } |
|
247 | - } |
|
244 | + break; |
|
245 | + } |
|
246 | + } |
|
247 | + } |
|
248 | 248 | |
249 | 249 | $proxy = Injector::inst()->create('SilverStripe\Control\Middleware\TrustedProxyMiddleware'); |
250 | 250 | |
251 | - if ($headerOverrideIP) { |
|
252 | - return $proxy->getIPFromHeaderValue($headerOverrideIP); |
|
253 | - } |
|
251 | + if ($headerOverrideIP) { |
|
252 | + return $proxy->getIPFromHeaderValue($headerOverrideIP); |
|
253 | + } |
|
254 | 254 | |
255 | 255 | if (isset($_SERVER['REMOTE_ADDR'])) { |
256 | - return $_SERVER['REMOTE_ADDR']; |
|
257 | - } |
|
256 | + return $_SERVER['REMOTE_ADDR']; |
|
257 | + } |
|
258 | 258 | |
259 | 259 | return ''; |
260 | - } |
|
260 | + } |
|
261 | 261 | |
262 | 262 | } |