Skip to content

fix: detection of flash backup activation state #1769

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
pujitm merged 3 commits into from
Nov 7, 2025
Merged

fix: detection of flash backup activation state #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5d2959
fix: api version detection in UpdateFlashBackup.php
pujitm Nov 6, 2025
e9bffda
fix: UI updates to reflect flash activation
pujitm Nov 6, 2025
8a05540
fix: don't dedupe flash backup updates
pujitm Nov 6, 2025
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
19 changes: 18 additions & 1 deletion plugin/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/Connect.page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,12 +575,30 @@ _(Flash backup)_:
<script>
changeRemoteAccess($('#remoteAccess'));
var flashbackupsub = new NchanSubscriber('/sub/flashbackup');
var initialFlashBackupState = <?=
json_encode(
$flashbackup_status ?: [],
JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP
)
?> || {};

if (Object.keys(initialFlashBackupState).length === 0) {
initialFlashBackupState = {
activated: 'no',
uptodate: 'no',
loading: '',
error: '',
remoteerror: ''
};
}

flashbackupsub.on('message', function(data) {
var ini = parseINI(data);

buttonStateReset(ini['flashbackup']);
});
$(function() {
buttonStateReset(initialFlashBackupState);
flashbackupsub.start();
if ( typeof caPluginUpdateCheck === "function" ) {
caPluginUpdateCheck("dynamix.unraid.net.plg",{name:"Unraid Connect"});
Expand All @@ -602,4 +620,3 @@ _(OIDC Configuration)_:

<!-- start unraid-api section -->
<unraid-connect-settings></unraid-connect-settings>

5 changes: 4 additions & 1 deletion ...amix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/include/UpdateFlashBackup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
require_once "$docroot/webGui/include/Wrappers.php";
require_once "$docroot/webGui/include/publish.php";
require_once "$docroot/plugins/dynamix.my.servers/include/connect-config.php";

$isRegistered = ConnectConfig::isUserSignedIn();
Expand All @@ -32,6 +33,7 @@
}

$isConnected = ($connectionStatus === 'CONNECTED') ? true : false;
$apiVersion = ApiConfig::getApiVersion();

$flashbackup_ini = '/var/local/emhttp/flashbackup.ini';

Expand Down Expand Up @@ -75,6 +77,7 @@ function save_flash_backup_state($loading='') {
$flashbackup_tmp = '/var/local/emhttp/flashbackup.new';
file_put_contents($flashbackup_tmp, $text);
rename($flashbackup_tmp, $flashbackup_ini);
publish('flashbackup', $text);
}

function default_flash_backup_state() {
Expand Down Expand Up @@ -416,7 +419,7 @@ function deleteLocalRepo() {
curl_setopt($ch, CURLOPT_POSTFIELDS, [
'keyfile' => $keyfile,
'version' => _var($var,'version'),
'api_version' => _var($mystatus, 'version'),
'api_version' => ($apiVersion && $apiVersion !== 'unknown') ? $apiVersion : '',
'bzfiles' => implode(',', $bzfilehashes)
]);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
Expand Down
Loading