Skip to content
Permalink
Browse files

Merge branch 'wip-mdl-29396-m20' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_20_STABLE
  • Loading branch information...
Aparup Banerjee
Aparup Banerjee committed Nov 22, 2011
2 parents f50e703 + b256036 commit 31550708b462f5debbb81add1b48bf39431edf4d
Showing with 8 additions and 6 deletions.
  1. +8 −6 lib/setup.php
@@ -788,12 +788,14 @@ function stripslashes_deep($value) {
}
}
// in the first case, ip in allowed list will be performed first
// for example, client IP is 192.168.1.1
// 192.168 subnet is an entry in allowed list
// 192.168.1.1 is banned in blocked list
// This ip will be banned finally
if (!empty($CFG->allowbeforeblock)) { // allowed list processed before blocked list?
if (CLI_SCRIPT and !defined('WEB_CRON_EMULATED_CLI') and !PHPUNIT_SCRIPT) {
// no ip blocking
} else if (!empty($CFG->allowbeforeblock)) { // allowed list processed before blocked list?
// in this case, ip in allowed list will be performed first
// for example, client IP is 192.168.1.1
// 192.168 subnet is an entry in allowed list
// 192.168.1.1 is banned in blocked list
// This ip will be banned finally
if (!empty($CFG->allowedip)) {
if (!remoteip_in_list($CFG->allowedip)) {
die(get_string('ipblocked', 'admin'));

0 comments on commit 3155070

Please sign in to comment.
You can’t perform that action at this time.