Skip to content

bugfix update check #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MightyMCoder merged 1 commit into from
Jan 15, 2025
Merged

bugfix update check #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions preferences/preferences_check_for_update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ function getLatestBetaReleaseVersion($owner, $repo) {
$data = json_decode($response, true);
foreach ($data as $release) {
if ($release['prerelease']) {
return ['version' => ltrim($data['tag_name'], 'v'), 'release' => $release['name'], 'url' => $data['html_url']];
return ['version' => ltrim($release['tag_name'], 'v'), 'url' => $release['html_url']];
}
}

return ['version' => 'n/a', 'release' => '', 'url' => ''];
return ['version' => 'n/a', 'url' => ''];
}

/**
Expand All @@ -125,7 +125,7 @@ function getLatestBetaReleaseVersion($owner, $repo) {
* @param string $betaFlag The current beta version of the plugin.
* @return int An integer value indicating the update state.
*/
function checkVersion(string $currentVersion, string $checkStableVersion, string $checkBetaVersion, string $betaRelease, string $betaFlag): int
function checkVersion(string $currentVersion, string $checkStableVersion, string $currentBetaVersion, string $checkBetaVersion): int
{
// Update state (0 = No update, 1 = New stable version, 2 = New beta version, 3 = New stable + beta version)
$update = 0;
Expand All @@ -137,7 +137,7 @@ function checkVersion(string $currentVersion, string $checkStableVersion, string

// Check for beta version now
$status = version_compare($checkBetaVersion, $currentVersion);
if ($status === 1 || ($status === 0 && version_compare($betaRelease, $betaFlag, '>'))) {
if ($status === 1 || ($status === 0 && version_compare($checkBetaVersion, $currentBetaVersion, '>'))) {
if ($update === 1) {
$update = 3;
} else {
Expand All @@ -159,7 +159,6 @@ function checkVersion(string $currentVersion, string $checkStableVersion, string
$stableURL = $stableInfo['url'];

$betaVersion = $betaInfo['version'];
$betaRelease = $betaInfo['release'];
$betaURL = $betaInfo['url'];

// No stable version available (actually impossible)
Expand All @@ -170,11 +169,10 @@ function checkVersion(string $currentVersion, string $checkStableVersion, string
// No beta version available
if ($betaVersion === '') {
$betaVersion = 'n/a';
$betaRelease = '';
}

// check for update
$versionUpdate = checkVersion($PIMVersion, $stableVersion, $betaVersion, $betaRelease, $PIMBetaVersion);
$versionUpdate = checkVersion($PIMVersion, $stableVersion, $PIMBetaVersion, $betaVersion);


// Only continues in display mode, otherwise the current update state can be
Expand Down Expand Up @@ -212,7 +210,7 @@ function checkVersion(string $currentVersion, string $checkStableVersion, string
if ($versionUpdate !== 99 && $betaVersion !== 'n/a') {
echo '
<a class="btn" href="'.$betaURL.'" title="' . $gL10n->get('PLG_INVENTORY_MANAGER_DOWNLOAD_PAGE') . '" target="_blank">'.
'<i class="fas fa-link"></i>' . $betaVersion . ' Beta ' . $betaRelease . '
'<i class="fas fa-link"></i>' . $betaVersion . ' Beta
</a>';
} else {
echo $betaVersion;
Expand Down