mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
MDL-69074 admin: ensure consistent default for getremoteaddrconf
This commit is contained in:
parent
a2b286ce17
commit
2c93ca61d0
@ -94,7 +94,7 @@ $options = array(
|
||||
GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR');
|
||||
$temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'),
|
||||
new lang_string('configgetremoteaddrconf', 'admin'),
|
||||
GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP, $options));
|
||||
GETREMOTEADDR_SKIP_DEFAULT, $options));
|
||||
$temp->add(new admin_setting_configtext('reverseproxyignore', new lang_string('reverseproxyignore', 'admin'), new lang_string('configreverseproxyignore', 'admin'), ''));
|
||||
|
||||
$temp->add(new admin_setting_heading('webproxy', new lang_string('webproxy', 'admin'), new lang_string('webproxyinfo', 'admin')));
|
||||
|
@ -365,6 +365,10 @@ define('PAGE_COURSE_VIEW', 'course-view');
|
||||
define('GETREMOTEADDR_SKIP_HTTP_CLIENT_IP', '1');
|
||||
/** Get remote addr constant */
|
||||
define('GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR', '2');
|
||||
/**
|
||||
* GETREMOTEADDR_SKIP_DEFAULT defines the default behavior remote IP address validation.
|
||||
*/
|
||||
define('GETREMOTEADDR_SKIP_DEFAULT', GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP);
|
||||
|
||||
// Blog access level constant declaration.
|
||||
define ('BLOG_USER_LEVEL', 1);
|
||||
@ -9243,7 +9247,7 @@ function getremoteaddr($default='0.0.0.0') {
|
||||
if (empty($CFG->getremoteaddrconf)) {
|
||||
// This will happen, for example, before just after the upgrade, as the
|
||||
// user is redirected to the admin screen.
|
||||
$variablestoskip = 0;
|
||||
$variablestoskip = GETREMOTEADDR_SKIP_DEFAULT;
|
||||
} else {
|
||||
$variablestoskip = $CFG->getremoteaddrconf;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user