diff --git a/scripts/pi-hole/php/queryads.php b/scripts/pi-hole/php/queryads.php
index 65eabcec..f247c87a 100644
--- a/scripts/pi-hole/php/queryads.php
+++ b/scripts/pi-hole/php/queryads.php
@@ -6,7 +6,9 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
-ob_end_flush();
+while (ob_get_level() > 0) {
+ ob_end_flush();
+}
ini_set("output_buffering", "0");
ob_implicit_flush(true);
header('Content-Type: text/event-stream');
diff --git a/scripts/pi-hole/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
index 9a0f5d11..fc358d66 100644
--- a/scripts/pi-hole/php/savesettings.php
+++ b/scripts/pi-hole/php/savesettings.php
@@ -4,9 +4,7 @@
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
-* Please see LICENSE file for your rights under this license. */ ?>
-
- ["v4_1" => "8.8.8.8","v4_2" => "8.8.4.4", "v6_1" => "2001:4860:4860:0:0:0:0:8888", "v6_2" => "2001:4860:4860:0:0:0:0:8844"],
- "OpenDNS (ECS)" => ["v4_1" => "208.67.222.222", "v4_2" => "208.67.220.220", "v6_1" => "2620:0:ccc::2", "v6_2" => "2620:0:ccd::2"],
- "Level3" => ["v4_1" => "4.2.2.1", "v4_2" => "4.2.2.2"],
- "Norton" => ["v4_1" => "199.85.126.10", "v4_2" => "199.85.127.10"],
- "Comodo" => ["v4_1" => "8.26.56.26", "v4_2" => "8.20.247.20"],
- "DNS.WATCH" => ["v4_1" => "84.200.69.80", "v4_2" => "84.200.70.40", "v6_1" => "2001:1608:10:25:0:0:1c04:b12f", "v6_2" => "2001:1608:10:25:0:0:9249:d69b"],
- "Quad9 (filtered, DNSSEC)" => ["v4_1" => "9.9.9.9", "v4_2" => "149.112.112.112", "v6_1" => "2620:fe::fe", "v6_2" => "2620:fe::9"],
- "Quad9 (unfiltered, no DNSSEC)" => ["v4_1" => "9.9.9.10", "v4_2" => "149.112.112.10", "v6_1" => "2620:fe::10", "v6_2" => "2620:fe::fe:10"],
- "Quad9 (filtered + ECS)" => ["v4_1" => "9.9.9.11", "v4_2" => "149.112.112.11", "v6_1" => "2620:fe::11"],
- "Cloudflare" => ["v4_1" => "1.1.1.1", "v4_2" => "1.0.0.1", "v6_1" => "2606:4700:4700::1111", "v6_2" => "2606:4700:4700::1001"]
- ];
+$DNSserverslist = [];
+function readDNSserversList()
+{
+ // Reset list
+ $list = [];
+ $handle = @fopen("/etc/pihole/dns-servers.conf", "r");
+ if ($handle)
+ {
+ while (($line = fgets($handle)) !== false)
+ {
+ $line = rtrim($line);
+ $line = explode(';', $line);
+ $name = $line[0];
+ $values = [];
+ if (!empty($line[1])) {
+ $values["v4_1"] = $line[1];
+ }
+ if (!empty($line[2])) {
+ $values["v4_2"] = $line[2];
+ }
+ if (!empty($line[3])) {
+ $values["v6_1"] = $line[3];
+ }
+ if (!empty($line[4])) {
+ $values["v6_2"] = $line[4];
+ }
+ $list[$name] = $values;
+ }
+ fclose($handle);
+ }
+ return $list;
+}
$adlist = [];
function readAdlists()
@@ -155,7 +173,7 @@ function readAdlists()
{
// Comments start either with "##" or "# "
if($line[1] !== "#" &&
- $line[1] !== " ")
+ $line[1] !== " ")
{
// Commented list
array_push($list, [false,rtrim(substr($line, 1))]);
@@ -174,6 +192,8 @@ function readAdlists()
// Read available adlists
$adlist = readAdlists();
+ // Read available DNS server list
+ $DNSserverslist = readDNSserversList();
$error = "";
$success = "";
diff --git a/scripts/pi-hole/php/sub.php b/scripts/pi-hole/php/sub.php
index b2dc0c51..1c9bc8fe 100644
--- a/scripts/pi-hole/php/sub.php
+++ b/scripts/pi-hole/php/sub.php
@@ -4,19 +4,24 @@
* Network-wide ad blocking via your own hardware.
*
* This file is copyright under the latest version of the EUPL.
-* Please see LICENSE file for your rights under this license. */ ?>
+* Please see LICENSE file for your rights under this license. */
- -1 && buffer[pos - 1] != ".")
- chrs = buffer[pos - 1] + chrs;
- else chrs = "0" + chrs;
- return new RegExp("2[0-5]|[01][0-9]").test(chrs);
- },
- cardinality: 1,
- definitionSymbol: "i"
- },
- 'z': {
- validator: function (chrs, buffer, pos, strict, opts) {
- if (pos - 1 > -1 && buffer[pos - 1] != ".") {
- chrs = buffer[pos - 1] + chrs;
- if (pos - 2 > -1 && buffer[pos - 2] != ".") {
- chrs = buffer[pos - 2] + chrs;
- } else chrs = "0" + chrs;
- } else chrs = "00" + chrs;
- return new RegExp("25[0-5]|2[0-4][0-9]|[01][0-9][0-9]").test(chrs);
- },
- cardinality: 1,
- definitionSymbol: "i"
- }
- }
- }//,
- // "ipv6": { //ip-address mask
- // mask: ["[xxxx][:xxxx][:xxxx][:xxxx][:xxxx][:xxxx][:xxxx][:xxxx]"],
- // //placeholder: '____:____:____:____:____:____:____:____:____',
- // definitions: {
- // 'x': {
- // validator: "[0-9a-f]",
- // cardinality: 1,
- // casing: "upper" //auto uppercasing
- // }
- // }
- // }
- });
-})(jQuery);
diff --git a/scripts/vendor/jquery.inputmask.js b/scripts/vendor/jquery.inputmask.js
deleted file mode 100644
index 86cb3205..00000000
--- a/scripts/vendor/jquery.inputmask.js
+++ /dev/null
@@ -1,1627 +0,0 @@
-/**
-* @license Input Mask plugin for jquery
-* http://github.com/RobinHerbots/jquery.inputmask
-* Copyright (c) 2010 - 2014 Robin Herbots
-* Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php)
-* Version: 0.0.0
-*/
-
-(function ($) {
- if ($.fn.inputmask === undefined) {
- //helper functions
- function isInputEventSupported(eventName) {
- var el = document.createElement('input'),
- eventName = 'on' + eventName,
- isSupported = (eventName in el);
- if (!isSupported) {
- el.setAttribute(eventName, 'return;');
- isSupported = typeof el[eventName] == 'function';
- }
- el = null;
- return isSupported;
- }
- function resolveAlias(aliasStr, options, opts) {
- var aliasDefinition = opts.aliases[aliasStr];
- if (aliasDefinition) {
- if (aliasDefinition.alias) resolveAlias(aliasDefinition.alias, undefined, opts); //alias is another alias
- $.extend(true, opts, aliasDefinition); //merge alias definition in the options
- $.extend(true, opts, options); //reapply extra given options
- return true;
- }
- return false;
- }
- function generateMaskSets(opts) {
- var ms = [];
- var genmasks = []; //used to keep track of the masks that where processed, to avoid duplicates
- function getMaskTemplate(mask) {
- if (opts.numericInput) {
- mask = mask.split('').reverse().join('');
- }
- var escaped = false, outCount = 0, greedy = opts.greedy, repeat = opts.repeat;
- if (repeat == "*") greedy = false;
- //if (greedy == true && opts.placeholder == "") opts.placeholder = " ";
- if (mask.length == 1 && greedy == false && repeat != 0) { opts.placeholder = ""; } //hide placeholder with single non-greedy mask
- var singleMask = $.map(mask.split(""), function (element, index) {
- var outElem = [];
- if (element == opts.escapeChar) {
- escaped = true;
- }
- else if ((element != opts.optionalmarker.start && element != opts.optionalmarker.end) || escaped) {
- var maskdef = opts.definitions[element];
- if (maskdef && !escaped) {
- for (var i = 0; i < maskdef.cardinality; i++) {
- outElem.push(opts.placeholder.charAt((outCount + i) % opts.placeholder.length));
- }
- } else {
- outElem.push(element);
- escaped = false;
- }
- outCount += outElem.length;
- return outElem;
- }
- });
-
- //allocate repetitions
- var repeatedMask = singleMask.slice();
- for (var i = 1; i < repeat && greedy; i++) {
- repeatedMask = repeatedMask.concat(singleMask.slice());
- }
-
- return { "mask": repeatedMask, "repeat": repeat, "greedy": greedy };
- }
- //test definition => {fn: RegExp/function, cardinality: int, optionality: bool, newBlockMarker: bool, offset: int, casing: null/upper/lower, def: definitionSymbol}
- function getTestingChain(mask) {
- if (opts.numericInput) {
- mask = mask.split('').reverse().join('');
- }
- var isOptional = false, escaped = false;
- var newBlockMarker = false; //indicates wheter the begin/ending of a block should be indicated
-
- return $.map(mask.split(""), function (element, index) {
- var outElem = [];
-
- if (element == opts.escapeChar) {
- escaped = true;
- } else if (element == opts.optionalmarker.start && !escaped) {
- isOptional = true;
- newBlockMarker = true;
- }
- else if (element == opts.optionalmarker.end && !escaped) {
- isOptional = false;
- newBlockMarker = true;
- }
- else {
- var maskdef = opts.definitions[element];
- if (maskdef && !escaped) {
- var prevalidators = maskdef["prevalidator"], prevalidatorsL = prevalidators ? prevalidators.length : 0;
- for (var i = 1; i < maskdef.cardinality; i++) {
- var prevalidator = prevalidatorsL >= i ? prevalidators[i - 1] : [], validator = prevalidator["validator"], cardinality = prevalidator["cardinality"];
- outElem.push({ fn: validator ? typeof validator == 'string' ? new RegExp(validator) : new function () { this.test = validator; } : new RegExp("."), cardinality: cardinality ? cardinality : 1, optionality: isOptional, newBlockMarker: isOptional == true ? newBlockMarker : false, offset: 0, casing: maskdef["casing"], def: maskdef["definitionSymbol"] || element });
- if (isOptional == true) //reset newBlockMarker
- newBlockMarker = false;
- }
- outElem.push({ fn: maskdef.validator ? typeof maskdef.validator == 'string' ? new RegExp(maskdef.validator) : new function () { this.test = maskdef.validator; } : new RegExp("."), cardinality: maskdef.cardinality, optionality: isOptional, newBlockMarker: newBlockMarker, offset: 0, casing: maskdef["casing"], def: maskdef["definitionSymbol"] || element });
- } else {
- outElem.push({ fn: null, cardinality: 0, optionality: isOptional, newBlockMarker: newBlockMarker, offset: 0, casing: null, def: element });
- escaped = false;
- }
- //reset newBlockMarker
- newBlockMarker = false;
- return outElem;
- }
- });
- }
- function markOptional(maskPart) { //needed for the clearOptionalTail functionality
- return opts.optionalmarker.start + maskPart + opts.optionalmarker.end;
- }
- function splitFirstOptionalEndPart(maskPart) {
- var optionalStartMarkers = 0, optionalEndMarkers = 0, mpl = maskPart.length;
- for (var i = 0; i < mpl; i++) {
- if (maskPart.charAt(i) == opts.optionalmarker.start) {
- optionalStartMarkers++;
- }
- if (maskPart.charAt(i) == opts.optionalmarker.end) {
- optionalEndMarkers++;
- }
- if (optionalStartMarkers > 0 && optionalStartMarkers == optionalEndMarkers)
- break;
- }
- var maskParts = [maskPart.substring(0, i)];
- if (i < mpl) {
- maskParts.push(maskPart.substring(i + 1, mpl));
- }
- return maskParts;
- }
- function splitFirstOptionalStartPart(maskPart) {
- var mpl = maskPart.length;
- for (var i = 0; i < mpl; i++) {
- if (maskPart.charAt(i) == opts.optionalmarker.start) {
- break;
- }
- }
- var maskParts = [maskPart.substring(0, i)];
- if (i < mpl) {
- maskParts.push(maskPart.substring(i + 1, mpl));
- }
- return maskParts;
- }
- function generateMask(maskPrefix, maskPart, metadata) {
- var maskParts = splitFirstOptionalEndPart(maskPart);
- var newMask, maskTemplate;
-
- var masks = splitFirstOptionalStartPart(maskParts[0]);
- if (masks.length > 1) {
- newMask = maskPrefix + masks[0] + markOptional(masks[1]) + (maskParts.length > 1 ? maskParts[1] : "");
- if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
- genmasks.push(newMask);
- maskTemplate = getMaskTemplate(newMask);
- ms.push({
- "mask": newMask,
- "_buffer": maskTemplate["mask"],
- "buffer": maskTemplate["mask"].slice(),
- "tests": getTestingChain(newMask),
- "lastValidPosition": -1,
- "greedy": maskTemplate["greedy"],
- "repeat": maskTemplate["repeat"],
- "metadata": metadata
- });
- }
- newMask = maskPrefix + masks[0] + (maskParts.length > 1 ? maskParts[1] : "");
- if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
- genmasks.push(newMask);
- maskTemplate = getMaskTemplate(newMask);
- ms.push({
- "mask": newMask,
- "_buffer": maskTemplate["mask"],
- "buffer": maskTemplate["mask"].slice(),
- "tests": getTestingChain(newMask),
- "lastValidPosition": -1,
- "greedy": maskTemplate["greedy"],
- "repeat": maskTemplate["repeat"],
- "metadata": metadata
- });
- }
- if (splitFirstOptionalStartPart(masks[1]).length > 1) { //optional contains another optional
- generateMask(maskPrefix + masks[0], masks[1] + maskParts[1], metadata);
- }
- if (maskParts.length > 1 && splitFirstOptionalStartPart(maskParts[1]).length > 1) {
- generateMask(maskPrefix + masks[0] + markOptional(masks[1]), maskParts[1], metadata);
- generateMask(maskPrefix + masks[0], maskParts[1], metadata);
- }
- }
- else {
- newMask = maskPrefix + maskParts;
- if ($.inArray(newMask, genmasks) == -1 && newMask != "") {
- genmasks.push(newMask);
- maskTemplate = getMaskTemplate(newMask);
- ms.push({
- "mask": newMask,
- "_buffer": maskTemplate["mask"],
- "buffer": maskTemplate["mask"].slice(),
- "tests": getTestingChain(newMask),
- "lastValidPosition": -1,
- "greedy": maskTemplate["greedy"],
- "repeat": maskTemplate["repeat"],
- "metadata": metadata
- });
- }
- }
-
- }
-
- if ($.isFunction(opts.mask)) { //allow mask to be a preprocessing fn - should return a valid mask
- opts.mask = opts.mask.call(this, opts);
- }
- if ($.isArray(opts.mask)) {
- $.each(opts.mask, function (ndx, msk) {
- if (msk["mask"] != undefined) {
- generateMask("", msk["mask"].toString(), msk);
- } else
- generateMask("", msk.toString());
- });
- } else generateMask("", opts.mask.toString());
-
- return opts.greedy ? ms : ms.sort(function (a, b) { return a["mask"].length - b["mask"].length; });
- }
-
- var msie10 = navigator.userAgent.match(new RegExp("msie 10", "i")) !== null,
- iphone = navigator.userAgent.match(new RegExp("iphone", "i")) !== null,
- android = navigator.userAgent.match(new RegExp("android.*safari.*", "i")) !== null,
- androidchrome = navigator.userAgent.match(new RegExp("android.*chrome.*", "i")) !== null,
- pasteEvent = isInputEventSupported('paste') ? 'paste' : isInputEventSupported('input') ? 'input' : "propertychange";
-
-
- //masking scope
- //actionObj definition see below
- function maskScope(masksets, activeMasksetIndex, opts, actionObj) {
- var isRTL = false,
- valueOnFocus = getActiveBuffer().join(''),
- $el, chromeValueOnInput,
- skipKeyPressEvent = false, //Safari 5.1.x - modal dialog fires keypress twice workaround
- skipInputEvent = false, //skip when triggered from within inputmask
- ignorable = false;
-
-
- //maskset helperfunctions
-
- function getActiveMaskSet() {
- return masksets[activeMasksetIndex];
- }
-
- function getActiveTests() {
- return getActiveMaskSet()['tests'];
- }
-
- function getActiveBufferTemplate() {
- return getActiveMaskSet()['_buffer'];
- }
-
- function getActiveBuffer() {
- return getActiveMaskSet()['buffer'];
- }
-
- function isValid(pos, c, strict) { //strict true ~ no correction or autofill
- strict = strict === true; //always set a value to strict to prevent possible strange behavior in the extensions
-
- function _isValid(position, activeMaskset, c, strict) {
- var testPos = determineTestPosition(position), loopend = c ? 1 : 0, chrs = '', buffer = activeMaskset["buffer"];
- for (var i = activeMaskset['tests'][testPos].cardinality; i > loopend; i--) {
- chrs += getBufferElement(buffer, testPos - (i - 1));
- }
-
- if (c) {
- chrs += c;
- }
-
- //return is false or a json object => { pos: ??, c: ??} or true
- return activeMaskset['tests'][testPos].fn != null ?
- activeMaskset['tests'][testPos].fn.test(chrs, buffer, position, strict, opts)
- : (c == getBufferElement(activeMaskset['_buffer'], position, true) || c == opts.skipOptionalPartCharacter) ?
- { "refresh": true, c: getBufferElement(activeMaskset['_buffer'], position, true), pos: position }
- : false;
- }
-
- function PostProcessResults(maskForwards, results) {
- var hasValidActual = false;
- $.each(results, function (ndx, rslt) {
- hasValidActual = $.inArray(rslt["activeMasksetIndex"], maskForwards) == -1 && rslt["result"] !== false;
- if (hasValidActual) return false;
- });
- if (hasValidActual) { //strip maskforwards
- results = $.map(results, function (rslt, ndx) {
- if ($.inArray(rslt["activeMasksetIndex"], maskForwards) == -1) {
- return rslt;
- } else {
- masksets[rslt["activeMasksetIndex"]]["lastValidPosition"] = actualLVP;
- }
- });
- } else { //keep maskforwards with the least forward
- var lowestPos = -1, lowestIndex = -1, rsltValid;
- $.each(results, function (ndx, rslt) {
- if ($.inArray(rslt["activeMasksetIndex"], maskForwards) != -1 && rslt["result"] !== false & (lowestPos == -1 || lowestPos > rslt["result"]["pos"])) {
- lowestPos = rslt["result"]["pos"];
- lowestIndex = rslt["activeMasksetIndex"];
- }
- });
- results = $.map(results, function (rslt, ndx) {
- if ($.inArray(rslt["activeMasksetIndex"], maskForwards) != -1) {
- if (rslt["result"]["pos"] == lowestPos) {
- return rslt;
- } else if (rslt["result"] !== false) {
- for (var i = pos; i < lowestPos; i++) {
- rsltValid = _isValid(i, masksets[rslt["activeMasksetIndex"]], masksets[lowestIndex]["buffer"][i], true);
- if (rsltValid === false) {
- masksets[rslt["activeMasksetIndex"]]["lastValidPosition"] = lowestPos - 1;
- break;
- } else {
- setBufferElement(masksets[rslt["activeMasksetIndex"]]["buffer"], i, masksets[lowestIndex]["buffer"][i], true);
- masksets[rslt["activeMasksetIndex"]]["lastValidPosition"] = i;
- }
- }
- //also check check for the lowestpos with the new input
- rsltValid = _isValid(lowestPos, masksets[rslt["activeMasksetIndex"]], c, true);
- if (rsltValid !== false) {
- setBufferElement(masksets[rslt["activeMasksetIndex"]]["buffer"], lowestPos, c, true);
- masksets[rslt["activeMasksetIndex"]]["lastValidPosition"] = lowestPos;
- }
- //console.log("ndx " + rslt["activeMasksetIndex"] + " validate " + masksets[rslt["activeMasksetIndex"]]["buffer"].join('') + " lv " + masksets[rslt["activeMasksetIndex"]]['lastValidPosition']);
- return rslt;
- }
- }
- });
- }
- return results;
- }
-
- if (strict) {
- var result = _isValid(pos, getActiveMaskSet(), c, strict); //only check validity in current mask when validating strict
- if (result === true) {
- result = { "pos": pos }; //always take a possible corrected maskposition into account
- }
- return result;
- }
-
- var results = [], result = false, currentActiveMasksetIndex = activeMasksetIndex,
- actualBuffer = getActiveBuffer().slice(), actualLVP = getActiveMaskSet()["lastValidPosition"],
- actualPrevious = seekPrevious(pos),
- maskForwards = [];
- $.each(masksets, function (index, value) {
- if (typeof (value) == "object") {
- activeMasksetIndex = index;
-
- var maskPos = pos;
- var lvp = getActiveMaskSet()['lastValidPosition'],
- rsltValid;
- if (lvp == actualLVP) {
- if ((maskPos - actualLVP) > 1) {
- for (var i = lvp == -1 ? 0 : lvp; i < maskPos; i++) {
- rsltValid = _isValid(i, getActiveMaskSet(), actualBuffer[i], true);
- if (rsltValid === false) {
- break;
- } else {
- setBufferElement(getActiveBuffer(), i, actualBuffer[i], true);
- if (rsltValid === true) {
- rsltValid = { "pos": i }; //always take a possible corrected maskposition into account
- }
- var newValidPosition = rsltValid.pos || i;
- if (getActiveMaskSet()['lastValidPosition'] < newValidPosition)
- getActiveMaskSet()['lastValidPosition'] = newValidPosition; //set new position from isValid
- }
- }
- }
- //does the input match on a further position?
- if (!isMask(maskPos) && !_isValid(maskPos, getActiveMaskSet(), c, strict)) {
- var maxForward = seekNext(maskPos) - maskPos;
- for (var fw = 0; fw < maxForward; fw++) {
- if (_isValid(++maskPos, getActiveMaskSet(), c, strict) !== false)
- break;
- }
- maskForwards.push(activeMasksetIndex);
- //console.log('maskforward ' + activeMasksetIndex + " pos " + pos + " maskPos " + maskPos);
- }
- }
-
- if (getActiveMaskSet()['lastValidPosition'] >= actualLVP || activeMasksetIndex == currentActiveMasksetIndex) {
- if (maskPos >= 0 && maskPos < getMaskLength()) {
- result = _isValid(maskPos, getActiveMaskSet(), c, strict);
- if (result !== false) {
- if (result === true) {
- result = { "pos": maskPos }; //always take a possible corrected maskposition into account
- }
- var newValidPosition = result.pos || maskPos;
- if (getActiveMaskSet()['lastValidPosition'] < newValidPosition)
- getActiveMaskSet()['lastValidPosition'] = newValidPosition; //set new position from isValid
- }
- //console.log("pos " + pos + " ndx " + activeMasksetIndex + " validate " + getActiveBuffer().join('') + " lv " + getActiveMaskSet()['lastValidPosition']);
- results.push({ "activeMasksetIndex": index, "result": result });
- }
- }
- }
- });
- activeMasksetIndex = currentActiveMasksetIndex; //reset activeMasksetIndex
-
- return PostProcessResults(maskForwards, results); //return results of the multiple mask validations
- }
-
- function determineActiveMasksetIndex() {
- var currentMasksetIndex = activeMasksetIndex,
- highestValid = { "activeMasksetIndex": 0, "lastValidPosition": -1, "next": -1 };
- $.each(masksets, function (index, value) {
- if (typeof (value) == "object") {
- activeMasksetIndex = index;
- if (getActiveMaskSet()['lastValidPosition'] > highestValid['lastValidPosition']) {
- highestValid["activeMasksetIndex"] = index;
- highestValid["lastValidPosition"] = getActiveMaskSet()['lastValidPosition'];
- highestValid["next"] = seekNext(getActiveMaskSet()['lastValidPosition']);
- } else if (getActiveMaskSet()['lastValidPosition'] == highestValid['lastValidPosition'] &&
- (highestValid['next'] == -1 || highestValid['next'] > seekNext(getActiveMaskSet()['lastValidPosition']))) {
- highestValid["activeMasksetIndex"] = index;
- highestValid["lastValidPosition"] = getActiveMaskSet()['lastValidPosition'];
- highestValid["next"] = seekNext(getActiveMaskSet()['lastValidPosition']);
- }
- }
- });
-
- activeMasksetIndex = highestValid["lastValidPosition"] != -1 && masksets[currentMasksetIndex]["lastValidPosition"] == highestValid["lastValidPosition"] ? currentMasksetIndex : highestValid["activeMasksetIndex"];
- if (currentMasksetIndex != activeMasksetIndex) {
- clearBuffer(getActiveBuffer(), seekNext(highestValid["lastValidPosition"]), getMaskLength());
- getActiveMaskSet()["writeOutBuffer"] = true;
- }
- $el.data('_inputmask')['activeMasksetIndex'] = activeMasksetIndex; //store the activeMasksetIndex
- }
-
- function isMask(pos) {
- var testPos = determineTestPosition(pos);
- var test = getActiveTests()[testPos];
-
- return test != undefined ? test.fn : false;
- }
-
- function determineTestPosition(pos) {
- return pos % getActiveTests().length;
- }
-
- function getMaskLength() {
- return opts.getMaskLength(getActiveBufferTemplate(), getActiveMaskSet()['greedy'], getActiveMaskSet()['repeat'], getActiveBuffer(), opts);
- }
-
- //pos: from position
-
- function seekNext(pos) {
- var maskL = getMaskLength();
- if (pos >= maskL) return maskL;
- var position = pos;
- while (++position < maskL && !isMask(position)) {
- }
- return position;
- }
-
- //pos: from position
-
- function seekPrevious(pos) {
- var position = pos;
- if (position <= 0) return 0;
-
- while (--position > 0 && !isMask(position)) {
- }
- return position;
- }
-
- function setBufferElement(buffer, position, element, autoPrepare) {
- if (autoPrepare) position = prepareBuffer(buffer, position);
-
- var test = getActiveTests()[determineTestPosition(position)];
- var elem = element;
- if (elem != undefined && test != undefined) {
- switch (test.casing) {
- case "upper":
- elem = element.toUpperCase();
- break;
- case "lower":
- elem = element.toLowerCase();
- break;
- }
- }
-
- buffer[position] = elem;
- }
-
- function getBufferElement(buffer, position, autoPrepare) {
- if (autoPrepare) position = prepareBuffer(buffer, position);
- return buffer[position];
- }
-
- //needed to handle the non-greedy mask repetitions
-
- function prepareBuffer(buffer, position) {
- var j;
- while (buffer[position] == undefined && buffer.length < getMaskLength()) {
- j = 0;
- while (getActiveBufferTemplate()[j] !== undefined) { //add a new buffer
- buffer.push(getActiveBufferTemplate()[j++]);
- }
- }
-
- return position;
- }
-
- function writeBuffer(input, buffer, caretPos) {
- input._valueSet(buffer.join(''));
- if (caretPos != undefined) {
- caret(input, caretPos);
- }
- }
-
- function clearBuffer(buffer, start, end, stripNomasks) {
- for (var i = start, maskL = getMaskLength() ; i < end && i < maskL; i++) {
- if (stripNomasks === true) {
- if (!isMask(i))
- setBufferElement(buffer, i, "");
- } else
- setBufferElement(buffer, i, getBufferElement(getActiveBufferTemplate().slice(), i, true));
- }
- }
-
- function setReTargetPlaceHolder(buffer, pos) {
- var testPos = determineTestPosition(pos);
- setBufferElement(buffer, pos, getBufferElement(getActiveBufferTemplate(), testPos));
- }
-
- function getPlaceHolder(pos) {
- return opts.placeholder.charAt(pos % opts.placeholder.length);
- }
-
- function checkVal(input, writeOut, strict, nptvl, intelliCheck) {
- var inputValue = nptvl != undefined ? nptvl.slice() : truncateInput(input._valueGet()).split('');
-
- $.each(masksets, function (ndx, ms) {
- if (typeof (ms) == "object") {
- ms["buffer"] = ms["_buffer"].slice();
- ms["lastValidPosition"] = -1;
- ms["p"] = -1;
- }
- });
- if (strict !== true) activeMasksetIndex = 0;
- if (writeOut) input._valueSet(""); //initial clear
- var ml = getMaskLength();
- $.each(inputValue, function (ndx, charCode) {
- if (intelliCheck === true) {
- var p = getActiveMaskSet()["p"], lvp = p == -1 ? p : seekPrevious(p),
- pos = lvp == -1 ? ndx : seekNext(lvp);
- if ($.inArray(charCode, getActiveBufferTemplate().slice(lvp + 1, pos)) == -1) {
- keypressEvent.call(input, undefined, true, charCode.charCodeAt(0), writeOut, strict, ndx);
- }
- } else {
- keypressEvent.call(input, undefined, true, charCode.charCodeAt(0), writeOut, strict, ndx);
- }
- });
-
- if (strict === true && getActiveMaskSet()["p"] != -1) {
- getActiveMaskSet()["lastValidPosition"] = seekPrevious(getActiveMaskSet()["p"]);
- }
- }
-
- function escapeRegex(str) {
- return $.inputmask.escapeRegex.call(this, str);
- }
-
- function truncateInput(inputValue) {
- return inputValue.replace(new RegExp("(" + escapeRegex(getActiveBufferTemplate().join('')) + ")*$"), "");
- }
-
- function clearOptionalTail(input) {
- var buffer = getActiveBuffer(), tmpBuffer = buffer.slice(), testPos, pos;
- for (var pos = tmpBuffer.length - 1; pos >= 0; pos--) {
- var testPos = determineTestPosition(pos);
- if (getActiveTests()[testPos].optionality) {
- if (!isMask(pos) || !isValid(pos, buffer[pos], true))
- tmpBuffer.pop();
- else break;
- } else break;
- }
- writeBuffer(input, tmpBuffer);
- }
-
- function unmaskedvalue($input, skipDatepickerCheck) {
- if (getActiveTests() && (skipDatepickerCheck === true || !$input.hasClass('hasDatepicker'))) {
- //checkVal(input, false, true);
- var umValue = $.map(getActiveBuffer(), function (element, index) {
- return isMask(index) && isValid(index, element, true) ? element : null;
- });
- var unmaskedValue = (isRTL ? umValue.reverse() : umValue).join('');
- return opts.onUnMask != undefined ? opts.onUnMask.call(this, getActiveBuffer().join(''), unmaskedValue) : unmaskedValue;
- } else {
- return $input[0]._valueGet();
- }
- }
-
- function TranslatePosition(pos) {
- if (isRTL && typeof pos == 'number' && (!opts.greedy || opts.placeholder != "")) {
- var bffrLght = getActiveBuffer().length;
- pos = bffrLght - pos;
- }
- return pos;
- }
-
- function caret(input, begin, end) {
- var npt = input.jquery && input.length > 0 ? input[0] : input, range;
- if (typeof begin == 'number') {
- begin = TranslatePosition(begin);
- end = TranslatePosition(end);
- if (!$(input).is(':visible')) {
- return;
- }
- end = (typeof end == 'number') ? end : begin;
- npt.scrollLeft = npt.scrollWidth;
- if (opts.insertMode == false && begin == end) end++; //set visualization for insert/overwrite mode
- if (npt.setSelectionRange) {
- npt.selectionStart = begin;
- npt.selectionEnd = android ? begin : end;
-
- } else if (npt.createTextRange) {
- range = npt.createTextRange();
- range.collapse(true);
- range.moveEnd('character', end);
- range.moveStart('character', begin);
- range.select();
- }
- } else {
- if (!$(input).is(':visible')) {
- return { "begin": 0, "end": 0 };
- }
- if (npt.setSelectionRange) {
- begin = npt.selectionStart;
- end = npt.selectionEnd;
- } else if (document.selection && document.selection.createRange) {
- range = document.selection.createRange();
- begin = 0 - range.duplicate().moveStart('character', -100000);
- end = begin + range.text.length;
- }
- begin = TranslatePosition(begin);
- end = TranslatePosition(end);
- return { "begin": begin, "end": end };
- }
- }
-
- function isComplete(buffer) { //return true / false / undefined (repeat *)
- if (opts.repeat == "*") return undefined;
- var complete = false, highestValidPosition = 0, currentActiveMasksetIndex = activeMasksetIndex;
- $.each(masksets, function (ndx, ms) {
- if (typeof (ms) == "object") {
- activeMasksetIndex = ndx;
- var aml = seekPrevious(getMaskLength());
- if (ms["lastValidPosition"] >= highestValidPosition && ms["lastValidPosition"] == aml) {
- var msComplete = true;
- for (var i = 0; i <= aml; i++) {
- var mask = isMask(i), testPos = determineTestPosition(i);
- if ((mask && (buffer[i] == undefined || buffer[i] == getPlaceHolder(i))) || (!mask && buffer[i] != getActiveBufferTemplate()[testPos])) {
- msComplete = false;
- break;
- }
- }
- complete = complete || msComplete;
- if (complete) //break loop
- return false;
- }
- highestValidPosition = ms["lastValidPosition"];
- }
- });
- activeMasksetIndex = currentActiveMasksetIndex; //reset activeMaskset
- return complete;
- }
-
- function isSelection(begin, end) {
- return isRTL ? (begin - end) > 1 || ((begin - end) == 1 && opts.insertMode) :
- (end - begin) > 1 || ((end - begin) == 1 && opts.insertMode);
- }
-
-
- //private functions
- function installEventRuler(npt) {
- var events = $._data(npt).events;
-
- $.each(events, function (eventType, eventHandlers) {
- $.each(eventHandlers, function (ndx, eventHandler) {
- if (eventHandler.namespace == "inputmask") {
- if (eventHandler.type != "setvalue") {
- var handler = eventHandler.handler;
- eventHandler.handler = function (e) {
- if (this.readOnly || this.disabled)
- e.preventDefault;
- else
- return handler.apply(this, arguments);
- };
- }
- }
- });
- });
- }
-
- function patchValueProperty(npt) {
- var valueProperty;
- if (Object.getOwnPropertyDescriptor)
- valueProperty = Object.getOwnPropertyDescriptor(npt, "value");
- if (valueProperty && valueProperty.get) {
- if (!npt._valueGet) {
- var valueGet = valueProperty.get;
- var valueSet = valueProperty.set;
- npt._valueGet = function () {
- return isRTL ? valueGet.call(this).split('').reverse().join('') : valueGet.call(this);
- };
- npt._valueSet = function (value) {
- valueSet.call(this, isRTL ? value.split('').reverse().join('') : value);
- };
-
- Object.defineProperty(npt, "value", {
- get: function () {
- var $self = $(this), inputData = $(this).data('_inputmask'), masksets = inputData['masksets'],
- activeMasksetIndex = inputData['activeMasksetIndex'];
- return inputData && inputData['opts'].autoUnmask ? $self.inputmask('unmaskedvalue') : valueGet.call(this) != masksets[activeMasksetIndex]['_buffer'].join('') ? valueGet.call(this) : '';
- },
- set: function (value) {
- valueSet.call(this, value);
- $(this).triggerHandler('setvalue.inputmask');
- }
- });
- }
- } else if (document.__lookupGetter__ && npt.__lookupGetter__("value")) {
- if (!npt._valueGet) {
- var valueGet = npt.__lookupGetter__("value");
- var valueSet = npt.__lookupSetter__("value");
- npt._valueGet = function () {
- return isRTL ? valueGet.call(this).split('').reverse().join('') : valueGet.call(this);
- };
- npt._valueSet = function (value) {
- valueSet.call(this, isRTL ? value.split('').reverse().join('') : value);
- };
-
- npt.__defineGetter__("value", function () {
- var $self = $(this), inputData = $(this).data('_inputmask'), masksets = inputData['masksets'],
- activeMasksetIndex = inputData['activeMasksetIndex'];
- return inputData && inputData['opts'].autoUnmask ? $self.inputmask('unmaskedvalue') : valueGet.call(this) != masksets[activeMasksetIndex]['_buffer'].join('') ? valueGet.call(this) : '';
- });
- npt.__defineSetter__("value", function (value) {
- valueSet.call(this, value);
- $(this).triggerHandler('setvalue.inputmask');
- });
- }
- } else {
- if (!npt._valueGet) {
- npt._valueGet = function () { return isRTL ? this.value.split('').reverse().join('') : this.value; };
- npt._valueSet = function (value) { this.value = isRTL ? value.split('').reverse().join('') : value; };
- }
- if ($.valHooks.text == undefined || $.valHooks.text.inputmaskpatch != true) {
- var valueGet = $.valHooks.text && $.valHooks.text.get ? $.valHooks.text.get : function (elem) { return elem.value; };
- var valueSet = $.valHooks.text && $.valHooks.text.set ? $.valHooks.text.set : function (elem, value) {
- elem.value = value;
- return elem;
- };
-
- jQuery.extend($.valHooks, {
- text: {
- get: function (elem) {
- var $elem = $(elem);
- if ($elem.data('_inputmask')) {
- if ($elem.data('_inputmask')['opts'].autoUnmask)
- return $elem.inputmask('unmaskedvalue');
- else {
- var result = valueGet(elem),
- inputData = $elem.data('_inputmask'), masksets = inputData['masksets'],
- activeMasksetIndex = inputData['activeMasksetIndex'];
- return result != masksets[activeMasksetIndex]['_buffer'].join('') ? result : '';
- }
- } else return valueGet(elem);
- },
- set: function (elem, value) {
- var $elem = $(elem);
- var result = valueSet(elem, value);
- if ($elem.data('_inputmask')) $elem.triggerHandler('setvalue.inputmask');
- return result;
- },
- inputmaskpatch: true
- }
- });
- }
- }
- }
-
- //shift chars to left from start to end and put c at end position if defined
-
- function shiftL(start, end, c, maskJumps) {
- var buffer = getActiveBuffer();
- if (maskJumps !== false) //jumping over nonmask position
- while (!isMask(start) && start - 1 >= 0) start--;
- for (var i = start; i < end && i < getMaskLength() ; i++) {
- if (isMask(i)) {
- setReTargetPlaceHolder(buffer, i);
- var j = seekNext(i);
- var p = getBufferElement(buffer, j);
- if (p != getPlaceHolder(j)) {
- if (j < getMaskLength() && isValid(i, p, true) !== false && getActiveTests()[determineTestPosition(i)].def == getActiveTests()[determineTestPosition(j)].def) {
- setBufferElement(buffer, i, p, true);
- } else {
- if (isMask(i))
- break;
- }
- }
- } else {
- setReTargetPlaceHolder(buffer, i);
- }
- }
- if (c != undefined)
- setBufferElement(buffer, seekPrevious(end), c);
-
- if (getActiveMaskSet()["greedy"] == false) {
- var trbuffer = truncateInput(buffer.join('')).split('');
- buffer.length = trbuffer.length;
- for (var i = 0, bl = buffer.length; i < bl; i++) {
- buffer[i] = trbuffer[i];
- }
- if (buffer.length == 0) getActiveMaskSet()["buffer"] = getActiveBufferTemplate().slice();
- }
- return start; //return the used start position
- }
-
- function shiftR(start, end, c) {
- var buffer = getActiveBuffer();
- if (getBufferElement(buffer, start, true) != getPlaceHolder(start)) {
- for (var i = seekPrevious(end) ; i > start && i >= 0; i--) {
- if (isMask(i)) {
- var j = seekPrevious(i);
- var t = getBufferElement(buffer, j);
- if (t != getPlaceHolder(j)) {
- if (isValid(j, t, true) !== false && getActiveTests()[determineTestPosition(i)].def == getActiveTests()[determineTestPosition(j)].def) {
- setBufferElement(buffer, i, t, true);
- setReTargetPlaceHolder(buffer, j);
- } //else break;
- }
- } else
- setReTargetPlaceHolder(buffer, i);
- }
- }
- if (c != undefined && getBufferElement(buffer, start) == getPlaceHolder(start))
- setBufferElement(buffer, start, c);
- var lengthBefore = buffer.length;
- if (getActiveMaskSet()["greedy"] == false) {
- var trbuffer = truncateInput(buffer.join('')).split('');
- buffer.length = trbuffer.length;
- for (var i = 0, bl = buffer.length; i < bl; i++) {
- buffer[i] = trbuffer[i];
- }
- if (buffer.length == 0) getActiveMaskSet()["buffer"] = getActiveBufferTemplate().slice();
- }
- return end - (lengthBefore - buffer.length); //return new start position
- }
-
- function HandleRemove(input, k, pos) {
- if (opts.numericInput || isRTL) {
- switch (k) {
- case opts.keyCode.BACKSPACE:
- k = opts.keyCode.DELETE;
- break;
- case opts.keyCode.DELETE:
- k = opts.keyCode.BACKSPACE;
- break;
- }
- if (isRTL) {
- var pend = pos.end;
- pos.end = pos.begin;
- pos.begin = pend;
- }
- }
-
- var isSelection = true;
- if (pos.begin == pos.end) {
- var posBegin = k == opts.keyCode.BACKSPACE ? pos.begin - 1 : pos.begin;
- if (opts.isNumeric && opts.radixPoint != "" && getActiveBuffer()[posBegin] == opts.radixPoint) {
- pos.begin = (getActiveBuffer().length - 1 == posBegin) /* radixPoint is latest? delete it */ ? pos.begin : k == opts.keyCode.BACKSPACE ? posBegin : seekNext(posBegin);
- pos.end = pos.begin;
- }
- isSelection = false;
- if (k == opts.keyCode.BACKSPACE)
- pos.begin--;
- else if (k == opts.keyCode.DELETE)
- pos.end++;
- } else if (pos.end - pos.begin == 1 && !opts.insertMode) {
- isSelection = false;
- if (k == opts.keyCode.BACKSPACE)
- pos.begin--;
- }
-
- clearBuffer(getActiveBuffer(), pos.begin, pos.end);
-
- var ml = getMaskLength();
- if (opts.greedy == false) {
- shiftL(pos.begin, ml, undefined, !isRTL && (k == opts.keyCode.BACKSPACE && !isSelection));
- } else {
- var newpos = pos.begin;
- for (var i = pos.begin; i < pos.end; i++) { //seeknext to skip placeholders at start in selection
- if (isMask(i) || !isSelection)
- newpos = shiftL(pos.begin, ml, undefined, !isRTL && (k == opts.keyCode.BACKSPACE && !isSelection));
- }
- if (!isSelection) pos.begin = newpos;
- }
- var firstMaskPos = seekNext(-1);
- clearBuffer(getActiveBuffer(), pos.begin, pos.end, true);
- checkVal(input, false, masksets[1] == undefined || firstMaskPos >= pos.end, getActiveBuffer());
- if (getActiveMaskSet()['lastValidPosition'] < firstMaskPos) {
- getActiveMaskSet()["lastValidPosition"] = -1;
- getActiveMaskSet()["p"] = firstMaskPos;
- } else {
- getActiveMaskSet()["p"] = pos.begin;
- }
- }
-
- function keydownEvent(e) {
- //Safari 5.1.x - modal dialog fires keypress twice workaround
- skipKeyPressEvent = false;
- var input = this, $input = $(input), k = e.keyCode, pos = caret(input);
-
- //backspace, delete, and escape get special treatment
- if (k == opts.keyCode.BACKSPACE || k == opts.keyCode.DELETE || (iphone && k == 127) || e.ctrlKey && k == 88) { //backspace/delete
- e.preventDefault(); //stop default action but allow propagation
- if (k == 88) valueOnFocus = getActiveBuffer().join('');
- HandleRemove(input, k, pos);
- determineActiveMasksetIndex();
- writeBuffer(input, getActiveBuffer(), getActiveMaskSet()["p"]);
- if (input._valueGet() == getActiveBufferTemplate().join(''))
- $input.trigger('cleared');
-
- if (opts.showTooltip) { //update tooltip
- $input.prop("title", getActiveMaskSet()["mask"]);
- }
- } else if (k == opts.keyCode.END || k == opts.keyCode.PAGE_DOWN) { //when END or PAGE_DOWN pressed set position at lastmatch
- setTimeout(function () {
- var caretPos = seekNext(getActiveMaskSet()["lastValidPosition"]);
- if (!opts.insertMode && caretPos == getMaskLength() && !e.shiftKey) caretPos--;
- caret(input, e.shiftKey ? pos.begin : caretPos, caretPos);
- }, 0);
- } else if ((k == opts.keyCode.HOME && !e.shiftKey) || k == opts.keyCode.PAGE_UP) { //Home or page_up
- caret(input, 0, e.shiftKey ? pos.begin : 0);
- } else if (k == opts.keyCode.ESCAPE || (k == 90 && e.ctrlKey)) { //escape && undo
- checkVal(input, true, false, valueOnFocus.split(''));
- $input.click();
- } else if (k == opts.keyCode.INSERT && !(e.shiftKey || e.ctrlKey)) { //insert
- opts.insertMode = !opts.insertMode;
- caret(input, !opts.insertMode && pos.begin == getMaskLength() ? pos.begin - 1 : pos.begin);
- } else if (opts.insertMode == false && !e.shiftKey) {
- if (k == opts.keyCode.RIGHT) {
- setTimeout(function () {
- var caretPos = caret(input);
- caret(input, caretPos.begin);
- }, 0);
- } else if (k == opts.keyCode.LEFT) {
- setTimeout(function () {
- var caretPos = caret(input);
- caret(input, caretPos.begin - 1);
- }, 0);
- }
- }
-
- var currentCaretPos = caret(input);
- if (opts.onKeyDown.call(this, e, getActiveBuffer(), opts) === true) //extra stuff to execute on keydown
- caret(input, currentCaretPos.begin, currentCaretPos.end);
- ignorable = $.inArray(k, opts.ignorables) != -1;
- }
-
-
- function keypressEvent(e, checkval, k, writeOut, strict, ndx) {
- //Safari 5.1.x - modal dialog fires keypress twice workaround
- if (k == undefined && skipKeyPressEvent) return false;
- skipKeyPressEvent = true;
-
- var input = this, $input = $(input);
-
- e = e || window.event;
- var k = checkval ? k : (e.which || e.charCode || e.keyCode);
-
- if (checkval !== true && (!(e.ctrlKey && e.altKey) && (e.ctrlKey || e.metaKey || ignorable))) {
- return true;
- } else {
- if (k) {
- //special treat the decimal separator
- if (checkval !== true && k == 46 && e.shiftKey == false && opts.radixPoint == ",") k = 44;
-
- var pos, results, result, c = String.fromCharCode(k);
- if (checkval) {
- var pcaret = strict ? ndx : getActiveMaskSet()["lastValidPosition"] + 1;
- pos = { begin: pcaret, end: pcaret };
- } else {
- pos = caret(input);
- }
-
- //should we clear a possible selection??
- var isSlctn = isSelection(pos.begin, pos.end), redetermineLVP = false,
- initialIndex = activeMasksetIndex;
- if (isSlctn) {
- activeMasksetIndex = initialIndex;
- $.each(masksets, function (ndx, lmnt) { //init undobuffer for recovery when not valid
- if (typeof (lmnt) == "object") {
- activeMasksetIndex = ndx;
- getActiveMaskSet()["undoBuffer"] = getActiveBuffer().join('');
- }
- });
- HandleRemove(input, opts.keyCode.DELETE, pos);
- if (!opts.insertMode) { //preserve some space
- $.each(masksets, function (ndx, lmnt) {
- if (typeof (lmnt) == "object") {
- activeMasksetIndex = ndx;
- shiftR(pos.begin, getMaskLength());
- getActiveMaskSet()["lastValidPosition"] = seekNext(getActiveMaskSet()["lastValidPosition"]);
- }
- });
- }
- activeMasksetIndex = initialIndex; //restore index
- }
-
- var radixPosition = getActiveBuffer().join('').indexOf(opts.radixPoint);
- if (opts.isNumeric && checkval !== true && radixPosition != -1) {
- if (opts.greedy && pos.begin <= radixPosition) {
- pos.begin = seekPrevious(pos.begin);
- pos.end = pos.begin;
- } else if (c == opts.radixPoint) {
- pos.begin = radixPosition;
- pos.end = pos.begin;
- }
- }
-
-
- var p = pos.begin;
- results = isValid(p, c, strict);
- if (strict === true) results = [{ "activeMasksetIndex": activeMasksetIndex, "result": results }];
- var minimalForwardPosition = -1;
- $.each(results, function (index, result) {
- activeMasksetIndex = result["activeMasksetIndex"];
- getActiveMaskSet()["writeOutBuffer"] = true;
- var np = result["result"];
- if (np !== false) {
- var refresh = false, buffer = getActiveBuffer();
- if (np !== true) {
- refresh = np["refresh"]; //only rewrite buffer from isValid
- p = np.pos != undefined ? np.pos : p; //set new position from isValid
- c = np.c != undefined ? np.c : c; //set new char from isValid
- }
- if (refresh !== true) {
- if (opts.insertMode == true) {
- var lastUnmaskedPosition = getMaskLength();
- var bfrClone = buffer.slice();
- while (getBufferElement(bfrClone, lastUnmaskedPosition, true) != getPlaceHolder(lastUnmaskedPosition) && lastUnmaskedPosition >= p) {
- lastUnmaskedPosition = lastUnmaskedPosition == 0 ? -1 : seekPrevious(lastUnmaskedPosition);
- }
- if (lastUnmaskedPosition >= p) {
- shiftR(p, getMaskLength(), c);
- //shift the lvp if needed
- var lvp = getActiveMaskSet()["lastValidPosition"], nlvp = seekNext(lvp);
- if (nlvp != getMaskLength() && lvp >= p && (getBufferElement(getActiveBuffer(), nlvp, true) != getPlaceHolder(nlvp))) {
- getActiveMaskSet()["lastValidPosition"] = nlvp;
- }
- } else getActiveMaskSet()["writeOutBuffer"] = false;
- } else setBufferElement(buffer, p, c, true);
- if (minimalForwardPosition == -1 || minimalForwardPosition > seekNext(p)) {
- minimalForwardPosition = seekNext(p);
- }
- } else if (!strict) {
- var nextPos = p < getMaskLength() ? p + 1 : p;
- if (minimalForwardPosition == -1 || minimalForwardPosition > nextPos) {
- minimalForwardPosition = nextPos;
- }
- }
- if (minimalForwardPosition > getActiveMaskSet()["p"])
- getActiveMaskSet()["p"] = minimalForwardPosition; //needed for checkval strict
- }
- });
-
- if (strict !== true) {
- activeMasksetIndex = initialIndex;
- determineActiveMasksetIndex();
- }
- if (writeOut !== false) {
- $.each(results, function (ndx, rslt) {
- if (rslt["activeMasksetIndex"] == activeMasksetIndex) {
- result = rslt;
- return false;
- }
- });
- if (result != undefined) {
- var self = this;
- setTimeout(function () { opts.onKeyValidation.call(self, result["result"], opts); }, 0);
- if (getActiveMaskSet()["writeOutBuffer"] && result["result"] !== false) {
- var buffer = getActiveBuffer();
-
- var newCaretPosition;
- if (checkval) {
- newCaretPosition = undefined;
- } else if (opts.numericInput) {
- if (p > radixPosition) {
- newCaretPosition = seekPrevious(minimalForwardPosition);
- } else if (c == opts.radixPoint) {
- newCaretPosition = minimalForwardPosition - 1;
- } else newCaretPosition = seekPrevious(minimalForwardPosition - 1);
- } else {
- newCaretPosition = minimalForwardPosition;
- }
-
- writeBuffer(input, buffer, newCaretPosition);
- if (checkval !== true) {
- setTimeout(function () { //timeout needed for IE
- if (isComplete(buffer) === true)
- $input.trigger("complete");
- skipInputEvent = true;
- $input.trigger("input");
- }, 0);
- }
- } else if (isSlctn) {
- getActiveMaskSet()["buffer"] = getActiveMaskSet()["undoBuffer"].split('');
- }
- }
- }
-
- if (opts.showTooltip) { //update tooltip
- $input.prop("title", getActiveMaskSet()["mask"]);
- }
-
- //needed for IE8 and below
- if (e) e.preventDefault ? e.preventDefault() : e.returnValue = false;
- }
- }
- }
-
- function keyupEvent(e) {
- var $input = $(this), input = this, k = e.keyCode, buffer = getActiveBuffer();
-
- if (androidchrome && k == opts.keyCode.BACKSPACE) {
- if (chromeValueOnInput == input._valueGet())
- keydownEvent.call(this, e);
- }
-
- opts.onKeyUp.call(this, e, buffer, opts); //extra stuff to execute on keyup
- if (k == opts.keyCode.TAB && opts.showMaskOnFocus) {
- if ($input.hasClass('focus.inputmask') && input._valueGet().length == 0) {
- buffer = getActiveBufferTemplate().slice();
- writeBuffer(input, buffer);
- caret(input, 0);
- valueOnFocus = getActiveBuffer().join('');
- } else {
- writeBuffer(input, buffer);
- if (buffer.join('') == getActiveBufferTemplate().join('') && $.inArray(opts.radixPoint, buffer) != -1) {
- caret(input, TranslatePosition(0));
- $input.click();
- } else
- caret(input, TranslatePosition(0), TranslatePosition(getMaskLength()));
- }
- }
- }
-
- function inputEvent(e) {
- if (skipInputEvent === true) {
- skipInputEvent = false;
- return true;
- }
- var input = this, $input = $(input);
-
- chromeValueOnInput = getActiveBuffer().join('');
- checkVal(input, false, false);
- writeBuffer(input, getActiveBuffer());
- if (isComplete(getActiveBuffer()) === true)
- $input.trigger("complete");
- $input.click();
- }
-
- function mask(el) {
- $el = $(el);
- if ($el.is(":input")) {
- //store tests & original buffer in the input element - used to get the unmasked value
- $el.data('_inputmask', {
- 'masksets': masksets,
- 'activeMasksetIndex': activeMasksetIndex,
- 'opts': opts,
- 'isRTL': false
- });
-
- //show tooltip
- if (opts.showTooltip) {
- $el.prop("title", getActiveMaskSet()["mask"]);
- }
-
- //correct greedy setting if needed
- getActiveMaskSet()['greedy'] = getActiveMaskSet()['greedy'] ? getActiveMaskSet()['greedy'] : getActiveMaskSet()['repeat'] == 0;
-
- //handle maxlength attribute
- if ($el.attr("maxLength") != null) //only when the attribute is set
- {
- var maxLength = $el.prop('maxLength');
- if (maxLength > -1) { //handle *-repeat
- $.each(masksets, function (ndx, ms) {
- if (typeof (ms) == "object") {
- if (ms["repeat"] == "*") {
- ms["repeat"] = maxLength;
- }
- }
- });
- }
- if (getMaskLength() >= maxLength && maxLength > -1) { //FF sets no defined max length to -1
- if (maxLength < getActiveBufferTemplate().length) getActiveBufferTemplate().length = maxLength;
- if (getActiveMaskSet()['greedy'] == false) {
- getActiveMaskSet()['repeat'] = Math.round(maxLength / getActiveBufferTemplate().length);
- }
- $el.prop('maxLength', getMaskLength() * 2);
- }
- }
-
- patchValueProperty(el);
-
- if (opts.numericInput) opts.isNumeric = opts.numericInput;
- if (el.dir == "rtl" || (opts.numericInput && opts.rightAlignNumerics) || (opts.isNumeric && opts.rightAlignNumerics))
- $el.css("text-align", "right");
-
- if (el.dir == "rtl" || opts.numericInput) {
- el.dir = "ltr";
- $el.removeAttr("dir");
- var inputData = $el.data('_inputmask');
- inputData['isRTL'] = true;
- $el.data('_inputmask', inputData);
- isRTL = true;
- }
-
- //unbind all events - to make sure that no other mask will interfere when re-masking
- $el.unbind(".inputmask");
- $el.removeClass('focus.inputmask');
- //bind events
- $el.closest('form').bind("submit", function () { //trigger change on submit if any
- if (valueOnFocus != getActiveBuffer().join('')) {
- $el.change();
- }
- }).bind('reset', function () {
- setTimeout(function () {
- $el.trigger("setvalue");
- }, 0);
- });
- $el.bind("mouseenter.inputmask", function () {
- var $input = $(this), input = this;
- if (!$input.hasClass('focus.inputmask') && opts.showMaskOnHover) {
- if (input._valueGet() != getActiveBuffer().join('')) {
- writeBuffer(input, getActiveBuffer());
- }
- }
- }).bind("blur.inputmask", function () {
- var $input = $(this), input = this, nptValue = input._valueGet(), buffer = getActiveBuffer();
- $input.removeClass('focus.inputmask');
- if (valueOnFocus != getActiveBuffer().join('')) {
- $input.change();
- }
- if (opts.clearMaskOnLostFocus && nptValue != '') {
- if (nptValue == getActiveBufferTemplate().join(''))
- input._valueSet('');
- else { //clearout optional tail of the mask
- clearOptionalTail(input);
- }
- }
- if (isComplete(buffer) === false) {
- $input.trigger("incomplete");
- if (opts.clearIncomplete) {
- $.each(masksets, function (ndx, ms) {
- if (typeof (ms) == "object") {
- ms["buffer"] = ms["_buffer"].slice();
- ms["lastValidPosition"] = -1;
- }
- });
- activeMasksetIndex = 0;
- if (opts.clearMaskOnLostFocus)
- input._valueSet('');
- else {
- buffer = getActiveBufferTemplate().slice();
- writeBuffer(input, buffer);
- }
- }
- }
- }).bind("focus.inputmask", function () {
- var $input = $(this), input = this, nptValue = input._valueGet();
- if (opts.showMaskOnFocus && !$input.hasClass('focus.inputmask') && (!opts.showMaskOnHover || (opts.showMaskOnHover && nptValue == ''))) {
- if (input._valueGet() != getActiveBuffer().join('')) {
- writeBuffer(input, getActiveBuffer(), seekNext(getActiveMaskSet()["lastValidPosition"]));
- }
- }
- $input.addClass('focus.inputmask');
- valueOnFocus = getActiveBuffer().join('');
- }).bind("mouseleave.inputmask", function () {
- var $input = $(this), input = this;
- if (opts.clearMaskOnLostFocus) {
- if (!$input.hasClass('focus.inputmask') && input._valueGet() != $input.attr("placeholder")) {
- if (input._valueGet() == getActiveBufferTemplate().join('') || input._valueGet() == '')
- input._valueSet('');
- else { //clearout optional tail of the mask
- clearOptionalTail(input);
- }
- }
- }
- }).bind("click.inputmask", function () {
- var input = this;
- setTimeout(function () {
- var selectedCaret = caret(input), buffer = getActiveBuffer();
- if (selectedCaret.begin == selectedCaret.end) {
- var clickPosition = isRTL ? TranslatePosition(selectedCaret.begin) : selectedCaret.begin,
- lvp = getActiveMaskSet()["lastValidPosition"],
- lastPosition;
- if (opts.isNumeric) {
- lastPosition = opts.skipRadixDance === false && opts.radixPoint != "" && $.inArray(opts.radixPoint, buffer) != -1 ?
- (opts.numericInput ? seekNext($.inArray(opts.radixPoint, buffer)) : $.inArray(opts.radixPoint, buffer)) :
- seekNext(lvp);
- } else {
- lastPosition = seekNext(lvp);
- }
- if (clickPosition < lastPosition) {
- if (isMask(clickPosition))
- caret(input, clickPosition);
- else caret(input, seekNext(clickPosition));
- } else
- caret(input, lastPosition);
- }
- }, 0);
- }).bind('dblclick.inputmask', function () {
- var input = this;
- setTimeout(function () {
- caret(input, 0, seekNext(getActiveMaskSet()["lastValidPosition"]));
- }, 0);
- }).bind(pasteEvent + ".inputmask dragdrop.inputmask drop.inputmask", function (e) {
- if (skipInputEvent === true) {
- skipInputEvent = false;
- return true;
- }
- var input = this, $input = $(input);
-
- //paste event for IE8 and lower I guess ;-)
- if (e.type == "propertychange" && input._valueGet().length <= getMaskLength()) {
- return true;
- }
- setTimeout(function () {
- var pasteValue = opts.onBeforePaste != undefined ? opts.onBeforePaste.call(this, input._valueGet()) : input._valueGet();
- checkVal(input, true, false, pasteValue.split(''), true);
- if (isComplete(getActiveBuffer()) === true)
- $input.trigger("complete");
- $input.click();
- }, 0);
- }).bind('setvalue.inputmask', function () {
- var input = this;
- checkVal(input, true);
- valueOnFocus = getActiveBuffer().join('');
- if (input._valueGet() == getActiveBufferTemplate().join(''))
- input._valueSet('');
- }).bind('complete.inputmask', opts.oncomplete
- ).bind('incomplete.inputmask', opts.onincomplete
- ).bind('cleared.inputmask', opts.oncleared
- ).bind("keyup.inputmask", keyupEvent);
-
- if (androidchrome) {
- $el.bind("input.inputmask", inputEvent);
- } else {
- $el.bind("keydown.inputmask", keydownEvent
- ).bind("keypress.inputmask", keypressEvent);
- }
-
- if (msie10)
- $el.bind("input.inputmask", inputEvent);
-
- //apply mask
- checkVal(el, true, false);
- valueOnFocus = getActiveBuffer().join('');
- // Wrap document.activeElement in a try/catch block since IE9 throw "Unspecified error" if document.activeElement is undefined when we are in an IFrame.
- var activeElement;
- try {
- activeElement = document.activeElement;
- } catch (e) {
- }
- if (activeElement === el) { //position the caret when in focus
- $el.addClass('focus.inputmask');
- caret(el, seekNext(getActiveMaskSet()["lastValidPosition"]));
- } else if (opts.clearMaskOnLostFocus) {
- if (getActiveBuffer().join('') == getActiveBufferTemplate().join('')) {
- el._valueSet('');
- } else {
- clearOptionalTail(el);
- }
- } else {
- writeBuffer(el, getActiveBuffer());
- }
-
- installEventRuler(el);
- }
- }
-
- //action object
- if (actionObj != undefined) {
- switch (actionObj["action"]) {
- case "isComplete":
- return isComplete(actionObj["buffer"]);
- case "unmaskedvalue":
- isRTL = actionObj["$input"].data('_inputmask')['isRTL'];
- return unmaskedvalue(actionObj["$input"], actionObj["skipDatepickerCheck"]);
- case "mask":
- mask(actionObj["el"]);
- break;
- case "format":
- $el = $({});
- $el.data('_inputmask', {
- 'masksets': masksets,
- 'activeMasksetIndex': activeMasksetIndex,
- 'opts': opts,
- 'isRTL': opts.numericInput
- });
- if (opts.numericInput) {
- opts.isNumeric = opts.numericInput;
- isRTL = true;
- }
-
- checkVal($el, false, false, actionObj["value"].split(''), true);
- return getActiveBuffer().join('');
- }
- }
- }
- $.inputmask = {
- //options default
- defaults: {
- placeholder: "_",
- optionalmarker: { start: "[", end: "]" },
- quantifiermarker: { start: "{", end: "}" },
- groupmarker: { start: "(", end: ")" },
- escapeChar: "\\",
- mask: null,
- oncomplete: $.noop, //executes when the mask is complete
- onincomplete: $.noop, //executes when the mask is incomplete and focus is lost
- oncleared: $.noop, //executes when the mask is cleared
- repeat: 0, //repetitions of the mask: * ~ forever, otherwise specify an integer
- greedy: true, //true: allocated buffer for the mask and repetitions - false: allocate only if needed
- autoUnmask: false, //automatically unmask when retrieving the value with $.fn.val or value if the browser supports __lookupGetter__ or getOwnPropertyDescriptor
- clearMaskOnLostFocus: true,
- insertMode: true, //insert the input or overwrite the input
- clearIncomplete: false, //clear the incomplete input on blur
- aliases: {}, //aliases definitions => see jquery.inputmask.extensions.js
- onKeyUp: $.noop, //override to implement autocomplete on certain keys for example
- onKeyDown: $.noop, //override to implement autocomplete on certain keys for example
- onBeforePaste: undefined, //executes before masking the pasted value to allow preprocessing of the pasted value. args => pastedValue => return processedValue
- onUnMask: undefined, //executes after unmasking to allow postprocessing of the unmaskedvalue. args => maskedValue, unmaskedValue
- showMaskOnFocus: true, //show the mask-placeholder when the input has focus
- showMaskOnHover: true, //show the mask-placeholder when hovering the empty input
- onKeyValidation: $.noop, //executes on every key-press with the result of isValid. Params: result, opts
- skipOptionalPartCharacter: " ", //a character which can be used to skip an optional part of a mask
- showTooltip: false, //show the activemask as tooltip
- numericInput: false, //numericInput input direction style (input shifts to the left while holding the caret position)
- //numeric basic properties
- isNumeric: false, //enable numeric features
- radixPoint: "", //".", // | ","
- skipRadixDance: false, //disable radixpoint caret positioning
- rightAlignNumerics: true, //align numerics to the right
- //numeric basic properties
- definitions: {
- '9': {
- validator: "[0-9]",
- cardinality: 1
- },
- 'a': {
- validator: "[A-Za-z\u0410-\u044F\u0401\u0451]",
- cardinality: 1
- },
- '*': {
- validator: "[A-Za-z\u0410-\u044F\u0401\u04510-9]",
- cardinality: 1
- }
- },
- keyCode: {
- ALT: 18, BACKSPACE: 8, CAPS_LOCK: 20, COMMA: 188, COMMAND: 91, COMMAND_LEFT: 91, COMMAND_RIGHT: 93, CONTROL: 17, DELETE: 46, DOWN: 40, END: 35, ENTER: 13, ESCAPE: 27, HOME: 36, INSERT: 45, LEFT: 37, MENU: 93, NUMPAD_ADD: 107, NUMPAD_DECIMAL: 110, NUMPAD_DIVIDE: 111, NUMPAD_ENTER: 108,
- NUMPAD_MULTIPLY: 106, NUMPAD_SUBTRACT: 109, PAGE_DOWN: 34, PAGE_UP: 33, PERIOD: 190, RIGHT: 39, SHIFT: 16, SPACE: 32, TAB: 9, UP: 38, WINDOWS: 91
- },
- //specify keycodes which should not be considered in the keypress event, otherwise the preventDefault will stop their default behavior especially in FF
- ignorables: [8, 9, 13, 19, 27, 33, 34, 35, 36, 37, 38, 39, 40, 45, 46, 93, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123],
- getMaskLength: function (buffer, greedy, repeat, currentBuffer, opts) {
- var calculatedLength = buffer.length;
- if (!greedy) {
- if (repeat == "*") {
- calculatedLength = currentBuffer.length + 1;
- } else if (repeat > 1) {
- calculatedLength += (buffer.length * (repeat - 1));
- }
- }
- return calculatedLength;
- }
- },
- escapeRegex: function (str) {
- var specials = ['/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\'];
- return str.replace(new RegExp('(\\' + specials.join('|\\') + ')', 'gim'), '\\$1');
- },
- format: function (value, options) {
- var opts = $.extend(true, {}, $.inputmask.defaults, options);
- resolveAlias(opts.alias, options, opts);
- return maskScope(generateMaskSets(opts), 0, opts, { "action": "format", "value": value });
- }
- };
-
- $.fn.inputmask = function (fn, options) {
- var opts = $.extend(true, {}, $.inputmask.defaults, options),
- masksets,
- activeMasksetIndex = 0;
-
- if (typeof fn === "string") {
- switch (fn) {
- case "mask":
- //resolve possible aliases given by options
- resolveAlias(opts.alias, options, opts);
- masksets = generateMaskSets(opts);
- if (masksets.length == 0) { return this; }
-
- return this.each(function () {
- maskScope($.extend(true, {}, masksets), 0, opts, { "action": "mask", "el": this });
- });
- case "unmaskedvalue":
- var $input = $(this), input = this;
- if ($input.data('_inputmask')) {
- masksets = $input.data('_inputmask')['masksets'];
- activeMasksetIndex = $input.data('_inputmask')['activeMasksetIndex'];
- opts = $input.data('_inputmask')['opts'];
- return maskScope(masksets, activeMasksetIndex, opts, { "action": "unmaskedvalue", "$input": $input });
- } else return $input.val();
- case "remove":
- return this.each(function () {
- var $input = $(this), input = this;
- if ($input.data('_inputmask')) {
- masksets = $input.data('_inputmask')['masksets'];
- activeMasksetIndex = $input.data('_inputmask')['activeMasksetIndex'];
- opts = $input.data('_inputmask')['opts'];
- //writeout the unmaskedvalue
- input._valueSet(maskScope(masksets, activeMasksetIndex, opts, { "action": "unmaskedvalue", "$input": $input, "skipDatepickerCheck": true }));
- //clear data
- $input.removeData('_inputmask');
- //unbind all events
- $input.unbind(".inputmask");
- $input.removeClass('focus.inputmask');
- //restore the value property
- var valueProperty;
- if (Object.getOwnPropertyDescriptor)
- valueProperty = Object.getOwnPropertyDescriptor(input, "value");
- if (valueProperty && valueProperty.get) {
- if (input._valueGet) {
- Object.defineProperty(input, "value", {
- get: input._valueGet,
- set: input._valueSet
- });
- }
- } else if (document.__lookupGetter__ && input.__lookupGetter__("value")) {
- if (input._valueGet) {
- input.__defineGetter__("value", input._valueGet);
- input.__defineSetter__("value", input._valueSet);
- }
- }
- try { //try catch needed for IE7 as it does not supports deleting fns
- delete input._valueGet;
- delete input._valueSet;
- } catch (e) {
- input._valueGet = undefined;
- input._valueSet = undefined;
-
- }
- }
- });
- break;
- case "getemptymask": //return the default (empty) mask value, usefull for setting the default value in validation
- if (this.data('_inputmask')) {
- masksets = this.data('_inputmask')['masksets'];
- activeMasksetIndex = this.data('_inputmask')['activeMasksetIndex'];
- return masksets[activeMasksetIndex]['_buffer'].join('');
- }
- else return "";
- case "hasMaskedValue": //check wheter the returned value is masked or not; currently only works reliable when using jquery.val fn to retrieve the value
- return this.data('_inputmask') ? !this.data('_inputmask')['opts'].autoUnmask : false;
- case "isComplete":
- masksets = this.data('_inputmask')['masksets'];
- activeMasksetIndex = this.data('_inputmask')['activeMasksetIndex'];
- opts = this.data('_inputmask')['opts'];
- return maskScope(masksets, activeMasksetIndex, opts, { "action": "isComplete", "buffer": this[0]._valueGet().split('') });
- case "getmetadata": //return mask metadata if exists
- if (this.data('_inputmask')) {
- masksets = this.data('_inputmask')['masksets'];
- activeMasksetIndex = this.data('_inputmask')['activeMasksetIndex'];
- return masksets[activeMasksetIndex]['metadata'];
- }
- else return undefined;
- default:
- //check if the fn is an alias
- if (!resolveAlias(fn, options, opts)) {
- //maybe fn is a mask so we try
- //set mask
- opts.mask = fn;
- }
- masksets = generateMaskSets(opts);
- if (masksets.length == 0) { return this; }
- return this.each(function () {
- maskScope($.extend(true, {}, masksets), activeMasksetIndex, opts, { "action": "mask", "el": this });
- });
-
- break;
- }
- } else if (typeof fn == "object") {
- opts = $.extend(true, {}, $.inputmask.defaults, fn);
-
- resolveAlias(opts.alias, fn, opts); //resolve aliases
- masksets = generateMaskSets(opts);
- if (masksets.length == 0) { return this; }
- return this.each(function () {
- maskScope($.extend(true, {}, masksets), activeMasksetIndex, opts, { "action": "mask", "el": this });
- });
- } else if (fn == undefined) {
- //look for data-inputmask atribute - the attribute should only contain optipns
- return this.each(function () {
- var attrOptions = $(this).attr("data-inputmask");
- if (attrOptions && attrOptions != "") {
- try {
- attrOptions = attrOptions.replace(new RegExp("'", "g"), '"');
- var dataoptions = $.parseJSON("{" + attrOptions + "}");
- $.extend(true, dataoptions, options);
- opts = $.extend(true, {}, $.inputmask.defaults, dataoptions);
- resolveAlias(opts.alias, dataoptions, opts);
- opts.alias = undefined;
- $(this).inputmask(opts);
- } catch (ex) { } //need a more relax parseJSON
- }
- });
- }
- };
- }
-})(jQuery);
diff --git a/settings.php b/settings.php
index fca9a3cd..e2063097 100644
--- a/settings.php
+++ b/settings.php
@@ -400,7 +400,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
From
disabled>
@@ -411,7 +410,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
To
disabled>
@@ -425,7 +423,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
Router
disabled>
@@ -464,7 +461,6 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
disabled>
@@ -856,7 +852,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"
when enabling DNSSEC. A DNSSEC resolver test can be found
here.
-
If not configured as your DHCP server, Pi-hole won't able to
+
If not configured as your DHCP server, Pi-hole won't be able to
determine the names of devices on your local network. As a
result, tables such as Top Clients will only show IP addresses.
One solution for this is to configure Pi-hole to forward these
@@ -880,7 +876,7 @@ if (isset($_GET['tab']) && in_array($_GET['tab'], array("sysadmin", "blocklists"