Revert "Preserve reboot notices across GUI pages"

plugins/dynamix.plugin.manager/scripts/PluginAPI.php

@@ -31,55 +31,35 @@ function download_url($url, $path = "") {
 	return $out ?: false;
 }
 
-switch ($_POST['action']) {
-	case 'checkPlugin':
-		$options = $_POST['options'];
-		$plugin = $options['plugin'];
+$options = $_POST['options'];
+$plugin = $options['plugin'];
 
-		if ( ! $plugin || ! file_exists("/var/log/plugins/$plugin") ) {
-			echo json_encode(array("updateAvailable"=>false));
-			break;
-		}
+if ( ! $plugin || ! file_exists("/var/log/plugins/$plugin") ) {
+	echo json_encode(array("updateAvailable"=>false));
+	return;
+}
 
-		exec("mkdir -p /tmp/plugins");
-		@unlink("/tmp/plugins/$plugin");
-		$url = @plugin("pluginURL","/boot/config/plugins/$plugin");
-		download_url($url,"/tmp/plugins/$plugin");
+exec("mkdir -p /tmp/plugins");
+@unlink("/tmp/plugins/$plugin");
+$url = @plugin("pluginURL","/boot/config/plugins/$plugin");
+download_url($url,"/tmp/plugins/$plugin");
 
-		$changes = @plugin("changes","/tmp/plugins/$plugin");
-		$version = @plugin("version","/tmp/plugins/$plugin");
-		$installedVersion = @plugin("version","/boot/config/plugins/$plugin");
-		$min = @plugin("min","/tmp/plugins/$plugin") ?: "6.4.0";
-		if ( $changes ) {
-			file_put_contents("/tmp/plugins/".pathinfo($plugin, PATHINFO_FILENAME).".txt",$changes);
-		} else {
-			@unlink("/tmp/plugins/".pathinfo($plugin, PATHINFO_FILENAME).".txt");
-		}
+$changes = @plugin("changes","/tmp/plugins/$plugin");
+$version = @plugin("version","/tmp/plugins/$plugin");
+$installedVersion = @plugin("version","/boot/config/plugins/$plugin");
+$min = @plugin("min","/tmp/plugins/$plugin") ?: "6.4.0";
+if ( $changes ) {
+	file_put_contents("/tmp/plugins/".pathinfo($plugin, PATHINFO_FILENAME).".txt",$changes);
+} else {
+	@unlink("/tmp/plugins/".pathinfo($plugin, PATHINFO_FILENAME).".txt");
+}
 
-		$update = false;
-		if ( strcmp($version,$installedVersion) > 0 ) {
-			$unraid = parse_ini_file("/etc/unraid-version");
-			$update = (version_compare($min,$unraid['version'],">")) ? false : true;
-		}
+$update = false;
+if ( strcmp($version,$installedVersion) > 0 ) {
+	$unraid = parse_ini_file("/etc/unraid-version");
+	$update = (version_compare($min,$unraid['version'],">")) ? false : true;
+}
+
+echo json_encode(array("updateAvailable" => $update,"version" => $version,"min"=>$min,"changes"=>$changes,"installedVersion"=>$installedVersion));
 
-		echo json_encode(array("updateAvailable" => $update,"version" => $version,"min"=>$min,"changes"=>$changes,"installedVersion"=>$installedVersion));
-		break;
-	
-	case 'addRebootNotice':
-		$message = htmlspecialchars(trim($_POST['message']));
-		if (!$message) break;
-		
-		$existing = @file("/tmp/reboot_notifications",FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES) ?: array();
-		$existing[] = $message;
-		
-		file_put_contents("/tmp/reboot_notifications",implode("\n",array_unique($existing)));
-		break;
-	
-	case 'removeRebootNotice':
-		$message = htmlspecialchars(trim($_POST['message']));
-		$existing = file_get_contents("/tmp/reboot_notifications");
-		$newReboots = str_replace($message,"",$existing);
-		file_put_contents("/tmp/reboot_notifications",$newReboots);
-		break;
-}	
 ?>

plugins/dynamix.vm.manager/VMSettings.page

@@ -232,6 +232,8 @@ VFIO allow unsafe interrupts:
 <?endif;?>
 : <input type="button" id="applyBtn" value="Apply" disabled><input type="button" value="Done" onclick="done()">
 </form>
+<div class="notice reboot" style="display:none;margin-bottom:24px">System must be rebooted for changes to take effect!</div>
+
 <?if (file_exists("/var/log/libvirt/libvirtd.log")):?>
 
 > View the log for libvirt: <a id="openlog" title="/var/log/libvirt/libvirtd.log" href="#" onclick="openWindow('/webGui/scripts/tail_log&arg1=libvirt/libvirtd.log','Libvirt Log',600,900);">/var/log/libvirt/libvirtd.log</a>
@@ -444,8 +446,7 @@ $(function(){
     });
   }
   $.post("/plugins/dynamix.vm.manager/include/VMajax.php", {action:'reboot'}, function(data){
-    var rebootMessage = "VM Settings: A reboot is required to apply changes";
-    if (data.modified) addRebootNotice(rebootMessage); else removeRebootNotice(rebootMessage);
+    if (data.modified) $('div.notice.reboot').show(); else $('div.notice.reboot').hide();
   });
 });
 </script>

plugins/dynamix/CPUisol.page

@@ -23,6 +23,7 @@ Tag="icon-cpu"
 <input type="button" value="Apply" onclick="apply(this.form)" disabled><input type="button" value="Done" onclick="done()"><span id="wait-is" class="red-text" style="display:none"><i class="fa fa-spinner fa-spin"></i> Please wait...</span>
 </form>
 <?if (!$safemode):?>
+<div class="notice isol" style="display:none">System must be rebooted for changes to take effect!</div>
 <?else:?>
 <div class="notice">CPU isolation is prohibited while system is running in SAFE MODE!</div>
 <?endif;?>

plugins/dynamix/CPUvms.page

@@ -152,9 +152,8 @@ function is() {
 }
 function notice() {
   // notice to reboot system after changes
-  var message = "CPU Isolation: A reboot is required to apply changes";
   $.post('/webGui/include/CPUset.php',{id:'cmd'},function(d){
-    if (d==1) addRebootNotice(message); else removeRebootNotice(message);
+    if (d==1) $('div.notice.isol').show(); else $('div.notice.isol').hide();
   });
 }
 function reset(form) {

plugins/dynamix/include/DefaultPageLayout.php

@@ -227,15 +227,11 @@ function addBannerWarning(text,warning=true,noDismiss=false) {
   if ( warning ) {
     text = "<i class='fa fa-warning' style='float:initial;'></i> "+text;
   }
-
+  var arrayEntry = bannerWarnings.push("placeholder") - 1;
   if ( ! noDismiss ) {
     text = text + "<a class='bannerDismiss' onclick='dismissBannerWarning("+arrayEntry+",&quot;"+cookieText+"&quot;)'></a>";
   }
-  if ( bannerWarnings.indexOf(text) < 0 ) {
-    var arrayEntry = bannerWarnings.push("placeholder") - 1;
-    bannerWarnings[arrayEntry] = text;
-  } else return bannerWarnings.indexOf(text);
-  
+  bannerWarnings[arrayEntry] = text;
   if ( ! bannerWarningInterval ) {
     showBannerWarnings();
     bannerWarningInterval = setInterval(function() {
@@ -287,22 +283,6 @@ function showUpgrade(data,noDismiss=false) {
     osUpgradeWarning = addBannerWarning(data.replace(/<a>(.*)<\/a>/,"<a href='#' onclick='hideUpgrade();openUpgrade();'>$1</a>"),false,noDismiss);
   }
 }
-
-function addRebootNotice(message="You must reboot for changes to take effect") {
-  addBannerWarning("<i class='fa fa-warning' style='float:initial;'></i> "+message,false,true);
-  $.post("/plugins/dynamix.plugin.manager/scripts/PluginAPI.php",{action:'addRebootNotice',message:message});
-}
-
-function removeRebootNotice(message="You must reboot for changes to take effect") {
-  var bannerIndex = bannerWarnings.indexOf("<i class='fa fa-warning' style='float:initial;'></i> "+message);
-  if ( bannerIndex < 0 ) {
-    return;
-  }
-  console.log("banner index: "+bannerIndex);
-  removeBannerWarning(bannerIndex);
-  $.post("/plugins/dynamix.plugin.manager/scripts/PluginAPI.php",{action:'removeRebootNotice',message:message});
-}
-
 function hideUpgrade(set) {
   removeBannerWarning(osUpgradeWarning);
   if (set)
@@ -408,21 +388,6 @@ $.ajaxPrefilter(function(s, orig, xhr){
     s.data += "csrf_token=<?=$var['csrf_token']?>";
   }
 });
-
-// add any pre-existing reboot notices  
-$(function() {
-<?
-  $rebootNotice = @file("/tmp/reboot_notifications") ?: array();
-  foreach ($rebootNotice as $notice):
-?>
-    var rebootMessage = "<?=trim($notice)?>";
-    if ( rebootMessage ) {
-      addBannerWarning("<i class='fa fa-warning' style='float:initial;'></i> "+rebootMessage,false,true);
-    }
-<?
-  endforeach;
-?>
-});
 </script>
 </head>
 <body>