diff --git a/admin/settings/server.php b/admin/settings/server.php index d846bc677a9..c1b20560e0f 100644 --- a/admin/settings/server.php +++ b/admin/settings/server.php @@ -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'))); diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 1eb7f317a4d..0418097c993 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -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; }