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

Update #86c46bd0u - Add support for predefined IP addresses/ranges

Browse Source
This commit is contained in:
Vincent Cornelis
2025-08-04 17:38:30 +02:00
parent 26669e73f1
commit fe3a5b2302
16 changed files with 1435 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
yui/build/moodle-availability_ipaddress-form/moodle-availability_ipaddress-form-debug.js vendored
View File

@@ -43,9 +43,11 @@ M.availability_ipaddress.form = Y.Object(M.core_availability.plugin);
* @method initInner
* @param {Array} param Array of objects
*/
M.availability_ipaddress.form.initInner = function() {
M.availability_ipaddress.form.initInner = function(param) {
"use strict";
Y.log('M.availability_ipaddress 1.10');
// Store predefined ranges from backend.
this.predefinedRanges = param || [];
};
/**
@@ -80,24 +82,68 @@ M.availability_ipaddress.form.getValue = function(field, node) {
*/
M.availability_ipaddress.form.getNode = function(json) {
"use strict";
var html, node, root, id;
var html, node, root, id, selectId, i, range;
// Make sure we work with unique id.
id = 'ipaddresses' + M.availability_ipaddress.form.instId;
selectId = 'predefined' + M.availability_ipaddress.form.instId;
M.availability_ipaddress.form.instId += 1;
// Create HTML structure.
html = '';
html += '<span class="availability-group"><label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('title', 'availability_ipaddress') + ' </span></label>';
html += '<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="' + id + '">';
node = Y.Node.create('<span class="form-inline">' + html + '</span>');
html = '<div class="availability-ipaddress-container">';
// Add predefined ranges if available.
if (this.predefinedRanges && this.predefinedRanges.length > 0) {
html += '<div class="availability-group">';
html += '<label><span class="p-r-1">' +
M.util.get_string('use_predefined', 'availability_ipaddress') + '</span></label>';
html += '<select name="predefined_ranges" id="' + selectId +
'" multiple="multiple" class="form-control" style="min-height: 100px;">';
for (i = 0; i < this.predefinedRanges.length; i++) {
range = this.predefinedRanges[i];
html += '<option value="' + range.id + '" data-ipaddresses="' + Y.Escape.html(range.ipaddresses) + '">';
html += Y.Escape.html(range.name);
html += '</option>';
}
html += '</select>';
html += '</div>';
html += '<div class="availability-group" style="margin-top: 10px;">';
html += '<label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('custom_ipaddress', 'availability_ipaddress') + '</span></label>';
} else {
html += '<div class="availability-group">';
html += '<label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('title', 'availability_ipaddress') + '</span></label>';
}
html += '<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="' +
id + '" class="form-control">';
html += '</div>';
html += '</div>';
node = Y.Node.create('<div>' + html + '</div>');
// Set initial values, if specified.
if (json.ipaddresses !== undefined) {
node.one('input[name=ipaddresses]').set('value', json.ipaddresses);
}
// Set selected predefined ranges if specified.
if (json.predefined_ranges !== undefined && this.predefinedRanges && this.predefinedRanges.length > 0) {
var select = node.one('select[name=predefined_ranges]');
if (select) {
json.predefined_ranges.forEach(function(rangeId) {
var option = select.one('option[value="' + rangeId + '"]');
if (option) {
option.set('selected', true);
}
});
}
}
// Add event handlers (first time only).
if (!M.availability_ipaddress.form.addedEvents) {
M.availability_ipaddress.form.addedEvents = true;
@@ -106,6 +152,11 @@ M.availability_ipaddress.form.getNode = function(json) {
// Trigger the updating of the hidden availability data whenever the ipaddress field changes.
M.core_availability.form.update();
}, '.availability_ipaddress input[name=ipaddresses]');
root.delegate('change', function() {
// Trigger the updating when predefined ranges are selected.
M.core_availability.form.update();
}, '.availability_ipaddress select[name=predefined_ranges]');
}
return node;
@@ -120,6 +171,10 @@ M.availability_ipaddress.form.getNode = function(json) {
M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
'use strict';
Y.log(ipaddresses);
// Return true for empty string - it's valid to have no custom IPs
if (!ipaddresses || ipaddresses.trim() === '') {
return true;
}
ipaddresses = ipaddresses.split(',');
for (var i in ipaddresses) {
@@ -134,7 +189,7 @@ M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
var ipv4Regex = new RegExp(
'^(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)' +
'(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}-' +
'([0-1]?[0-9]?[0-9]?|2[0-4][0-9]|25[0-5]){1}$',
'(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)$',
'gm'
);
@@ -178,6 +233,20 @@ M.availability_ipaddress.form.fillValue = function(value, node) {
// with the structure used in the __construct and save functions
// within condition.php.
value.ipaddresses = this.getValue('ipaddresses', node);
// Get selected predefined ranges.
var select = node.one('select[name=predefined_ranges]');
if (select) {
var selectedRanges = [];
select.get('options').each(function(option) {
if (option.get('selected')) {
selectedRanges.push(parseInt(option.get('value')));
}
});
if (selectedRanges.length > 0) {
value.predefined_ranges = selectedRanges;
}
}
};
/**
@@ -190,8 +259,9 @@ M.availability_ipaddress.form.fillErrors = function(errors, node) {
var value = {};
this.fillValue(value, node);
// Basic ipaddresses checks.
if (M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
// Basic ipaddresses checks - only validate if not empty.
if (value.ipaddresses && value.ipaddresses.trim() !== '' &&
M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
errors.push('availability_ipaddress:error_ipaddress');
}
};

2
yui/build/moodle-availability_ipaddress-form/moodle-availability_ipaddress-form-min.js vendored
View File

File diff suppressed because one or more lines are too long

90
yui/build/moodle-availability_ipaddress-form/moodle-availability_ipaddress-form.js vendored
View File

@@ -43,8 +43,10 @@ M.availability_ipaddress.form = Y.Object(M.core_availability.plugin);
* @method initInner
* @param {Array} param Array of objects
*/
M.availability_ipaddress.form.initInner = function() {
M.availability_ipaddress.form.initInner = function(param) {
"use strict";
// Store predefined ranges from backend.
this.predefinedRanges = param || [];
};
/**
@@ -77,24 +79,68 @@ M.availability_ipaddress.form.getValue = function(field, node) {
*/
M.availability_ipaddress.form.getNode = function(json) {
"use strict";
var html, node, root, id;
var html, node, root, id, selectId, i, range;
// Make sure we work with unique id.
id = 'ipaddresses' + M.availability_ipaddress.form.instId;
selectId = 'predefined' + M.availability_ipaddress.form.instId;
M.availability_ipaddress.form.instId += 1;
// Create HTML structure.
html = '';
html += '<span class="availability-group"><label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('title', 'availability_ipaddress') + ' </span></label>';
html += '<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="' + id + '">';
node = Y.Node.create('<span class="form-inline">' + html + '</span>');
html = '<div class="availability-ipaddress-container">';
// Add predefined ranges if available.
if (this.predefinedRanges && this.predefinedRanges.length > 0) {
html += '<div class="availability-group">';
html += '<label><span class="p-r-1">' +
M.util.get_string('use_predefined', 'availability_ipaddress') + '</span></label>';
html += '<select name="predefined_ranges" id="' + selectId +
'" multiple="multiple" class="form-control" style="min-height: 100px;">';
for (i = 0; i < this.predefinedRanges.length; i++) {
range = this.predefinedRanges[i];
html += '<option value="' + range.id + '" data-ipaddresses="' + Y.Escape.html(range.ipaddresses) + '">';
html += Y.Escape.html(range.name);
html += '</option>';
}
html += '</select>';
html += '</div>';
html += '<div class="availability-group" style="margin-top: 10px;">';
html += '<label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('custom_ipaddress', 'availability_ipaddress') + '</span></label>';
} else {
html += '<div class="availability-group">';
html += '<label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('title', 'availability_ipaddress') + '</span></label>';
}
html += '<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="' +
id + '" class="form-control">';
html += '</div>';
html += '</div>';
node = Y.Node.create('<div>' + html + '</div>');
// Set initial values, if specified.
if (json.ipaddresses !== undefined) {
node.one('input[name=ipaddresses]').set('value', json.ipaddresses);
}
// Set selected predefined ranges if specified.
if (json.predefined_ranges !== undefined && this.predefinedRanges && this.predefinedRanges.length > 0) {
var select = node.one('select[name=predefined_ranges]');
if (select) {
json.predefined_ranges.forEach(function(rangeId) {
var option = select.one('option[value="' + rangeId + '"]');
if (option) {
option.set('selected', true);
}
});
}
}
// Add event handlers (first time only).
if (!M.availability_ipaddress.form.addedEvents) {
M.availability_ipaddress.form.addedEvents = true;
@@ -103,6 +149,11 @@ M.availability_ipaddress.form.getNode = function(json) {
// Trigger the updating of the hidden availability data whenever the ipaddress field changes.
M.core_availability.form.update();
}, '.availability_ipaddress input[name=ipaddresses]');
root.delegate('change', function() {
// Trigger the updating when predefined ranges are selected.
M.core_availability.form.update();
}, '.availability_ipaddress select[name=predefined_ranges]');
}
return node;
@@ -116,6 +167,10 @@ M.availability_ipaddress.form.getNode = function(json) {
*/
M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
'use strict';
// Return true for empty string - it's valid to have no custom IPs
if (!ipaddresses || ipaddresses.trim() === '') {
return true;
}
ipaddresses = ipaddresses.split(',');
for (var i in ipaddresses) {
@@ -129,7 +184,7 @@ M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
var ipv4Regex = new RegExp(
'^(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)' +
'(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}-' +
'([0-1]?[0-9]?[0-9]?|2[0-4][0-9]|25[0-5]){1}$',
'(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)$',
'gm'
);
@@ -168,6 +223,20 @@ M.availability_ipaddress.form.fillValue = function(value, node) {
// with the structure used in the __construct and save functions
// within condition.php.
value.ipaddresses = this.getValue('ipaddresses', node);
// Get selected predefined ranges.
var select = node.one('select[name=predefined_ranges]');
if (select) {
var selectedRanges = [];
select.get('options').each(function(option) {
if (option.get('selected')) {
selectedRanges.push(parseInt(option.get('value')));
}
});
if (selectedRanges.length > 0) {
value.predefined_ranges = selectedRanges;
}
}
};
/**
@@ -180,8 +249,9 @@ M.availability_ipaddress.form.fillErrors = function(errors, node) {
var value = {};
this.fillValue(value, node);
// Basic ipaddresses checks.
if (M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
// Basic ipaddresses checks - only validate if not empty.
if (value.ipaddresses && value.ipaddresses.trim() !== '' &&
M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
errors.push('availability_ipaddress:error_ipaddress');
}
};

90
yui/src/form/js/form.js vendored
View File

@@ -41,9 +41,11 @@ M.availability_ipaddress.form = Y.Object(M.core_availability.plugin);
* @method initInner
* @param {Array} param Array of objects
*/
M.availability_ipaddress.form.initInner = function() {
M.availability_ipaddress.form.initInner = function(param) {
"use strict";
Y.log('M.availability_ipaddress 1.10');
// Store predefined ranges from backend.
this.predefinedRanges = param || [];
};
/**
@@ -78,24 +80,68 @@ M.availability_ipaddress.form.getValue = function(field, node) {
*/
M.availability_ipaddress.form.getNode = function(json) {
"use strict";
var html, node, root, id;
var html, node, root, id, selectId, i, range;
// Make sure we work with unique id.
id = 'ipaddresses' + M.availability_ipaddress.form.instId;
selectId = 'predefined' + M.availability_ipaddress.form.instId;
M.availability_ipaddress.form.instId += 1;
// Create HTML structure.
html = '';
html += '<span class="availability-group"><label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('title', 'availability_ipaddress') + ' </span></label>';
html += '<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="' + id + '">';
node = Y.Node.create('<span class="form-inline">' + html + '</span>');
html = '<div class="availability-ipaddress-container">';
// Add predefined ranges if available.
if (this.predefinedRanges && this.predefinedRanges.length > 0) {
html += '<div class="availability-group">';
html += '<label><span class="p-r-1">' +
M.util.get_string('use_predefined', 'availability_ipaddress') + '</span></label>';
html += '<select name="predefined_ranges" id="' + selectId +
'" multiple="multiple" class="form-control" style="min-height: 100px;">';
for (i = 0; i < this.predefinedRanges.length; i++) {
range = this.predefinedRanges[i];
html += '<option value="' + range.id + '" data-ipaddresses="' + Y.Escape.html(range.ipaddresses) + '">';
html += Y.Escape.html(range.name);
html += '</option>';
}
html += '</select>';
html += '</div>';
html += '<div class="availability-group" style="margin-top: 10px;">';
html += '<label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('custom_ipaddress', 'availability_ipaddress') + '</span></label>';
} else {
html += '<div class="availability-group">';
html += '<label for="' + id + '"><span class="p-r-1">' +
M.util.get_string('title', 'availability_ipaddress') + '</span></label>';
}
html += '<input type="text" placeholder="192.168.178.1,231.54.211.0/20,231.3.56.211" name="ipaddresses" id="' +
id + '" class="form-control">';
html += '</div>';
html += '</div>';
node = Y.Node.create('<div>' + html + '</div>');
// Set initial values, if specified.
if (json.ipaddresses !== undefined) {
node.one('input[name=ipaddresses]').set('value', json.ipaddresses);
}
// Set selected predefined ranges if specified.
if (json.predefined_ranges !== undefined && this.predefinedRanges && this.predefinedRanges.length > 0) {
var select = node.one('select[name=predefined_ranges]');
if (select) {
json.predefined_ranges.forEach(function(rangeId) {
var option = select.one('option[value="' + rangeId + '"]');
if (option) {
option.set('selected', true);
}
});
}
}
// Add event handlers (first time only).
if (!M.availability_ipaddress.form.addedEvents) {
M.availability_ipaddress.form.addedEvents = true;
@@ -104,6 +150,11 @@ M.availability_ipaddress.form.getNode = function(json) {
// Trigger the updating of the hidden availability data whenever the ipaddress field changes.
M.core_availability.form.update();
}, '.availability_ipaddress input[name=ipaddresses]');
root.delegate('change', function() {
// Trigger the updating when predefined ranges are selected.
M.core_availability.form.update();
}, '.availability_ipaddress select[name=predefined_ranges]');
}
return node;
@@ -118,6 +169,10 @@ M.availability_ipaddress.form.getNode = function(json) {
M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
'use strict';
Y.log(ipaddresses);
// Return true for empty string - it's valid to have no custom IPs
if (!ipaddresses || ipaddresses.trim() === '') {
return true;
}
ipaddresses = ipaddresses.split(',');
for (var i in ipaddresses) {
@@ -132,7 +187,7 @@ M.availability_ipaddress.validateIpaddress = function(ipaddresses) {
var ipv4Regex = new RegExp(
'^(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)' +
'(?:\\.(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]\\d|\\d)){3}-' +
'([0-1]?[0-9]?[0-9]?|2[0-4][0-9]|25[0-5]){1}$',
'(?:25[0-5]|2[0-4]\\d|1\\d\\d|[1-9]?\\d)$',
'gm'
);
@@ -176,6 +231,20 @@ M.availability_ipaddress.form.fillValue = function(value, node) {
// with the structure used in the __construct and save functions
// within condition.php.
value.ipaddresses = this.getValue('ipaddresses', node);
// Get selected predefined ranges.
var select = node.one('select[name=predefined_ranges]');
if (select) {
var selectedRanges = [];
select.get('options').each(function(option) {
if (option.get('selected')) {
selectedRanges.push(parseInt(option.get('value')));
}
});
if (selectedRanges.length > 0) {
value.predefined_ranges = selectedRanges;
}
}
};
/**
@@ -188,8 +257,9 @@ M.availability_ipaddress.form.fillErrors = function(errors, node) {
var value = {};
this.fillValue(value, node);
// Basic ipaddresses checks.
if (M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
// Basic ipaddresses checks - only validate if not empty.
if (value.ipaddresses && value.ipaddresses.trim() !== '' &&
M.availability_ipaddress.validateIpaddress(value.ipaddresses) === false) {
errors.push('availability_ipaddress:error_ipaddress');
}
};