mirror/moodle-availability_ipaddress
1
0
Fork 0
mirror of https://github.com/LdesignMedia/moodle-availability_ipaddress.git synced 2026-05-16 21:41:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support ipv4 ranges.

Browse Source
This commit is contained in:
Juan Pablo de Castro (UVa)
2022-02-01 08:41:47 +00:00
parent 4754b1e03e
commit e44acd4a7f
6 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
classes/condition.php
View File

@@ -119,7 +119,7 @@ class condition extends \core_availability\condition {
* @throws \coding_exception
*/
public function get_description($full, $not, info $info) : string {
return get_string('require_condition', 'availability_ipaddress');
return get_string('require_condition', 'availability_ipaddress', getremoteaddr());
}
/**
@@ -159,12 +159,14 @@ class condition extends \core_availability\condition {
public static function is_valid_ipaddresses($ipaddresses) : bool {
$ipaddresses = implode(',', $ipaddresses);
foreach ($ipaddresses as $ipaddress) {
if (!filter_var($ipaddress, FILTER_VALIDATE_IP)) {
if ( is_ip_address($ipaddress) === false &&
is_ipv4_range($ipaddress) === false &&
is_ipv6_range($ipaddress) === false ) {
return false;
}
}
return true;
return true;
}