diff options
Diffstat (limited to 'modules-available/sysconfig')
| -rw-r--r-- | modules-available/sysconfig/addmodule_custommodule.inc.php | 2 | ||||
| -rw-r--r-- | modules-available/sysconfig/api.inc.php | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php index bd94ebe9..746a0c23 100644 --- a/modules-available/sysconfig/addmodule_custommodule.inc.php +++ b/modules-available/sysconfig/addmodule_custommodule.inc.php @@ -40,7 +40,7 @@ class CustomModule_ProcessUpload extends AddModule_Base Message::addError('upload-failed', Util::uploadErrorString($_FILES['modulefile']['error'])); Util::redirect('?do=SysConfig', 400); } - $tempfile = '/tmp/bwlp-' . mt_rand(1, 100000) . '-' . crc32($_SERVER['REMOTE_ADDR']) . '.tmp'; + $tempfile = '/tmp/bwlp-' . mt_rand(1, 100000) . '-' . crc32(Util::getClientIp()) . '.tmp'; if (!move_uploaded_file($_FILES['modulefile']['tmp_name'], $tempfile)) { Message::addError('main.error-write', $tempfile); Util::redirect('?do=SysConfig'); diff --git a/modules-available/sysconfig/api.inc.php b/modules-available/sysconfig/api.inc.php index d639cbae..c37efe77 100644 --- a/modules-available/sysconfig/api.inc.php +++ b/modules-available/sysconfig/api.inc.php @@ -10,10 +10,9 @@ if (Request::any('action') === 'rebuild' && isLocalExecution()) { exit(1); } -$ip = $_SERVER['REMOTE_ADDR']; -if (substr($ip, 0, 7) === '::ffff:') { - $ip = substr($ip, 7); -} +$ip = Util::getClientIp(); +if ($ip === null) + ErrorHandler::traceError("could not determine client IP"); $uuid = Request::any('uuid', null, 'string'); if ($uuid !== null && strlen($uuid) !== 36) { |