diff --git a/package-lock.json b/package-lock.json
index 46c6cec5f..97ddfde66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -714,16 +714,16 @@
}
},
"es-abstract": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
- "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
+ "version": "1.20.2",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
+ "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
"dev": true,
"requires": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.1.1",
+ "get-intrinsic": "^1.1.2",
"get-symbol-description": "^1.0.0",
"has": "^1.0.3",
"has-property-descriptors": "^1.0.0",
@@ -735,9 +735,9 @@
"is-shared-array-buffer": "^1.0.2",
"is-string": "^1.0.7",
"is-weakref": "^1.0.2",
- "object-inspect": "^1.12.0",
+ "object-inspect": "^1.12.2",
"object-keys": "^1.1.1",
- "object.assign": "^4.1.2",
+ "object.assign": "^4.1.4",
"regexp.prototype.flags": "^1.4.3",
"string.prototype.trimend": "^1.0.5",
"string.prototype.trimstart": "^1.0.5",
@@ -3446,9 +3446,9 @@
"dev": true
},
"xo": {
- "version": "0.52.2",
- "resolved": "https://registry.npmjs.org/xo/-/xo-0.52.2.tgz",
- "integrity": "sha512-FTvJb6P6w1h3tu5jy3firRyLSqvJSHeffajpZ05RP4Xe0OUJkQzcwwOEF9/VUHC7lTBPnOrewEGJzQo8Mujx3Q==",
+ "version": "0.52.3",
+ "resolved": "https://registry.npmjs.org/xo/-/xo-0.52.3.tgz",
+ "integrity": "sha512-liCEteZ5z+QRyh3XzsYWQyxedBHBvx8CDlNvvi+BJz74L0E5/ID2v7JtoX3bD541AlMuOy4e/iWif6hhNGBFNw==",
"dev": true,
"requires": {
"@eslint/eslintrc": "^1.3.0",
@@ -3518,13 +3518,13 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.35.1",
- "@typescript-eslint/type-utils": "5.35.1",
- "@typescript-eslint/utils": "5.35.1",
+ "@typescript-eslint/scope-manager": "5.36.1",
+ "@typescript-eslint/type-utils": "5.36.1",
+ "@typescript-eslint/utils": "5.36.1",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -3534,47 +3534,48 @@
}
},
"@typescript-eslint/parser": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.35.1",
- "@typescript-eslint/types": "5.35.1",
- "@typescript-eslint/typescript-estree": "5.35.1",
+ "@typescript-eslint/scope-manager": "5.36.1",
+ "@typescript-eslint/types": "5.36.1",
+ "@typescript-eslint/typescript-estree": "5.36.1",
"debug": "^4.3.4"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.35.1",
- "@typescript-eslint/visitor-keys": "5.35.1"
+ "@typescript-eslint/types": "5.36.1",
+ "@typescript-eslint/visitor-keys": "5.36.1"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
- "@typescript-eslint/utils": "5.35.1",
+ "@typescript-eslint/typescript-estree": "5.36.1",
+ "@typescript-eslint/utils": "5.36.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.35.1",
- "@typescript-eslint/visitor-keys": "5.35.1",
+ "@typescript-eslint/types": "5.36.1",
+ "@typescript-eslint/visitor-keys": "5.36.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -3603,24 +3604,24 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.35.1",
- "@typescript-eslint/types": "5.35.1",
- "@typescript-eslint/typescript-estree": "5.35.1",
+ "@typescript-eslint/scope-manager": "5.36.1",
+ "@typescript-eslint/types": "5.36.1",
+ "@typescript-eslint/typescript-estree": "5.36.1",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.35.1",
+ "version": "5.36.1",
"bundled": true,
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.35.1",
+ "@typescript-eslint/types": "5.36.1",
"eslint-visitor-keys": "^3.3.0"
}
},
diff --git a/package.json b/package.json
index 0ead4cbbf..94a04bf80 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"postcss": "^8.4.16",
"postcss-cli": "^10.0.0",
"prettier": "2.7.1",
- "xo": "^0.52.2"
+ "xo": "^0.52.3"
},
"browserslist": [
"defaults",
diff --git a/scripts/pi-hole/php/password.php b/scripts/pi-hole/php/password.php
index 646f3296c..b2f014fbb 100644
--- a/scripts/pi-hole/php/password.php
+++ b/scripts/pi-hole/php/password.php
@@ -26,7 +26,7 @@
$pwhash = '';
}
-function verifyPassword($pwhash)
+function verifyPassword($pwhash, $use_api = false)
{
$validpassword = true;
@@ -86,7 +86,7 @@ function verifyPassword($pwhash)
if (hash_equals($pwhash, $_SESSION['hash'])) {
$_SESSION['auth'] = true;
}
- } elseif (isset($api) && isset($_GET['auth'])) {
+ } elseif ($use_api && isset($_GET['auth'])) {
// API can use the hash to get data without logging in via plain-text password
if (hash_equals($pwhash, $_GET['auth'])) {
$_SESSION['auth'] = true;
@@ -103,5 +103,5 @@ function verifyPassword($pwhash)
return $validpassword;
}
-$wrongpassword = !verifyPassword($pwhash);
+$wrongpassword = !verifyPassword($pwhash, isset($api));
$auth = $_SESSION['auth'];
diff --git a/scripts/pi-hole/php/update_checker.php b/scripts/pi-hole/php/update_checker.php
index 9670005ea..733b1574e 100644
--- a/scripts/pi-hole/php/update_checker.php
+++ b/scripts/pi-hole/php/update_checker.php
@@ -83,9 +83,6 @@ function checkUpdate($currentVersion, $latestVersion)
$docker_update = false;
} else {
$docker_update = checkUpdate($docker_current, $docker_latest);
-
- $dockerUrl = 'https://github.com/pi-hole/docker-pi-hole/releases';
- $dockerVersionStr = ''.$docker_current.'';
}
} else {
// Components comparison
@@ -102,26 +99,30 @@ function checkUpdate($currentVersion, $latestVersion)
$coreUrl = 'https://github.com/pi-hole/pi-hole/releases';
$webUrl = 'https://github.com/pi-hole/AdminLTE/releases';
$ftlUrl = 'https://github.com/pi-hole/FTL/releases';
+$dockerUrl = 'https://github.com/pi-hole/docker-pi-hole/releases';
// Version strings
// If "vDev" show branch/commit, else show link
-$coreVersionStr = $core_current;
if (isset($core_commit)) {
- $coreVersionStr .= ' ('.$core_branch.', '.$core_commit.')';
+ $coreVersionStr = $core_current.' ('.$core_branch.', '.$core_commit.')';
} else {
$coreVersionStr = ''.$core_current.'';
}
-$webVersionStr = $web_current;
if (isset($web_commit)) {
- $webVersionStr .= ' ('.$web_branch.', '.$web_commit.')';
+ $webVersionStr = $web_current.' ('.$web_branch.', '.$web_commit.')';
} else {
$webVersionStr = ''.$web_current.'';
}
-$ftlVersionStr = $FTL_current;
if (isset($FTL_commit)) {
- $ftlVersionStr .= ' ('.$FTL_branch.', '.$FTL_commit.')';
+ $ftlVersionStr = $FTL_current.' ('.$FTL_branch.', '.$FTL_commit.')';
} else {
$ftlVersionStr = ''.$FTL_current.'';
}
+
+if ($docker_current) {
+ $dockerVersionStr = ''.$docker_current.'';
+} else {
+ $dockerVersionStr = '';
+}