mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-24 18:49:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: suppress new GUI message when unRAID-OS is newer

Browse Source
This commit is contained in:
bergware
2016-09-25 20:13:39 +02:00
parent 0f47bf9dec
commit b0813b884e
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dynamix/include/DefaultPageLayout.php
View File

@@ -343,7 +343,7 @@ $(function() {
<?if (strpos(file_get_contents('/proc/cmdline'),'unraidsafemode')!==false):?>
showNotice('System running in <b>safe</b> mode');
<?else:?>
<?if ($version = plugin_update_available('unRAIDServer')):?>
<?if ($version = plugin_update_available('unRAIDServer',true)):?>
showNotice('unRAID OS v<?=$version?> is available. <a>Download Now</a>','unRAIDServer');
<?elseif (preg_match("/^\*\*REBOOT REQUIRED\!\*\*/", @file_get_contents('/usr/local/emhttp/plugins/unRAIDServer/README.md'))):?>
showNotice('Reboot required to apply unRAID OS update');

19
plugins/dynamix/include/Wrappers.php
View File

@@ -33,10 +33,19 @@ function agent_fullname($agent, $state) {
}
}
function plugin_update_available($plugin) {
$script = '/usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugin';
$local = file_exists("/var/log/plugins/$plugin.plg") ? exec("$script version /var/log/plugins/$plugin.plg") : "";
$remote = file_exists("/tmp/plugins/$plugin.plg") ? exec("$script version /tmp/plugins/$plugin.plg") : "";
return strcmp($remote,$local)>0 ? $remote : "";
function get_plugin_attr($attr, $file) {
exec("/usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugin $attr $file", $result, $error);
if ($error===0) return $result[0];
}
function plugin_update_available($plugin, $os=false) {
$local = get_plugin_attr('version', "/var/log/plugins/$plugin.plg");
$remote = get_plugin_attr('version', "/tmp/plugins/$plugin.plg");
if (strcmp($remote,$local)>0) {
if ($os) return $remote;
if (!$unraid = get_plugin_attr('unRAID', "/tmp/plugins/$plugin.plg")) return $remote;
$server = get_plugin_attr('version', "/var/log/plugins/unRAIDServer.plg");
if (version_compare($server, $unraid, '>=')) return $remote;
}
}
?>