Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-25 03:10:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Run PHP-CS-Fixer on all files

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2022-08-07 10:52:23 +02:00
parent 69e118ad45
commit 6ec4b8a529
47 changed files with 2643 additions and 2831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
scripts/pi-hole/php/update_checker.php
View File

@@ -1,54 +1,48 @@
<?php
$localversions = "/etc/pihole/localversions";
$localbranches = "/etc/pihole/localbranches";
$GitHubVersions = "/etc/pihole/GitHubVersions";
$localversions = '/etc/pihole/localversions';
$localbranches = '/etc/pihole/localbranches';
$GitHubVersions = '/etc/pihole/GitHubVersions';
if(!is_readable($localversions) || !is_readable($localbranches) || !is_readable($GitHubVersions))
{
$core_branch = "master";
$core_current = "N/A";
if (!is_readable($localversions) || !is_readable($localbranches) || !is_readable($GitHubVersions)) {
$core_branch = 'master';
$core_current = 'N/A';
$core_update = false;
$web_branch = "master";
$web_current = "N/A";
$web_branch = 'master';
$web_current = 'N/A';
$web_update = false;
$FTL_current = "N/A";
$FTL_current = 'N/A';
$FTL_update = false;
}
else
{
$versions = explode(" ", file_get_contents($localversions));
$branches = explode(" ", file_get_contents($localbranches));
$GitHubversions = explode(" ", file_get_contents($GitHubVersions));
} else {
$versions = explode(' ', file_get_contents($localversions));
$branches = explode(' ', file_get_contents($localbranches));
$GitHubversions = explode(' ', file_get_contents($GitHubVersions));
/********** Get Pi-hole core branch / version / commit **********/
// Get Pi-hole core branch / version / commit
// Check if on a dev branch
$core_branch = $branches[0];
if($core_branch !== "master") {
$core_current = "vDev";
if ('master' !== $core_branch) {
$core_current = 'vDev';
$core_commit = $versions[0];
}
else {
$core_current = explode("-",$versions[0])[0];
} else {
$core_current = explode('-', $versions[0])[0];
}
/********** Get Pi-hole web branch / version / commit **********/
// Get Pi-hole web branch / version / commit
$web_branch = $branches[1];
if($web_branch !== "master") {
$web_current = "vDev";
if ('master' !== $web_branch) {
$web_current = 'vDev';
$web_commit = $versions[1];
}
else {
$web_current = explode("-",$versions[1])[0];
} else {
$web_current = explode('-', $versions[1])[0];
}
/********** Get Pi-hole FTL (not a git repository) **********/
// Get Pi-hole FTL (not a git repository)
$FTL_branch = $branches[2];
if(substr($versions[2], 0, 4) === "vDev") {
$FTL_current = "vDev";
if ('vDev' === substr($versions[2], 0, 4)) {
$FTL_current = 'vDev';
$FTL_commit = $versions[2];
}
else {
} else {
$FTL_current = $versions[2];
}
@@ -58,40 +52,29 @@ else
$FTL_latest = $GitHubversions[2];
// Core version comparison
if($core_current !== "vDev")
{
if ('vDev' !== $core_current) {
// This logic allows the local core version to be newer than the upstream version
// The update indicator is only shown if the upstream version is NEWER
$core_update = (version_compare($core_current, $core_latest) < 0);
}
else
{
} else {
$core_update = false;
}
// Web version comparison
if($web_current !== "vDev")
{
if ('vDev' !== $web_current) {
// This logic allows the local core version to be newer than the upstream version
// The update indicator is only shown if the upstream version is NEWER
$web_update = (version_compare($web_current, $web_latest) < 0);
}
else
{
} else {
$web_update = false;
}
// FTL version comparison
// This logic allows the local core version to be newer than the upstream version
// The update indicator is only shown if the upstream version is NEWER
if($FTL_current !== "vDev")
{
if ('vDev' !== $FTL_current) {
$FTL_update = (version_compare($FTL_current, $FTL_latest) < 0);
}
else
{
} else {
$FTL_update = false;
}
}
?>