No cosmetic layout fixes, no functional changes

This commit is contained in:
Deon George 2023-03-03 10:05:55 +11:00
parent 2f9ea10be1
commit a389264ec4
2 changed files with 83 additions and 79 deletions

View File

@ -3,9 +3,9 @@ root = true
[*] [*]
charset = utf-8 charset = utf-8
end_of_line = lf end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4 indent_size = 4
indent_style = tab
insert_final_newline = false
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.md] [*.md]
@ -13,3 +13,6 @@ trim_trailing_whitespace = false
[*.{yml,yaml}] [*.{yml,yaml}]
indent_size = 2 indent_size = 2
[docker-compose.yml]
indent_size = 4

View File

@ -91,8 +91,8 @@ class VersionController extends Controller
return ['unknown'=>'vn.n.n-xxxx-hhhhhhhh']; return ['unknown'=>'vn.n.n-xxxx-hhhhhhhh'];
} }
public function getUserIpAddr(){ public function getUserIpAddr(): string
$ipaddress = ''; {
if (isset($_SERVER['HTTP_CLIENT_IP'])) if (isset($_SERVER['HTTP_CLIENT_IP']))
$ipaddress = $_SERVER['HTTP_CLIENT_IP']; $ipaddress = $_SERVER['HTTP_CLIENT_IP'];
else if(isset($_SERVER['HTTP_X_FORWARDED_FOR'])) else if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
@ -107,6 +107,7 @@ class VersionController extends Controller
$ipaddress = $_SERVER['REMOTE_ADDR']; $ipaddress = $_SERVER['REMOTE_ADDR'];
else else
$ipaddress = 'UNKNOWN'; $ipaddress = 'UNKNOWN';
return $ipaddress; return $ipaddress;
} }
} }