Permalink
Browse files

Merge branch 'wip-mdl-29396' of git://github.com/rajeshtaneja/moodle

  • Loading branch information...
2 parents 46fc365 + ade30ad commit 525e45795a4483f330690cba8bdee6869cdb2759 @nebgor nebgor committed Nov 22, 2011
Showing with 8 additions and 6 deletions.
  1. +8 −6 lib/setup.php
View
14 lib/setup.php
@@ -816,12 +816,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 525e457

Please sign in to comment.