From 4b158a25a3baeac8ccb58cd9572fa21c951affc9 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 29 Oct 2018 20:48:52 +0100
Subject: [PATCH] Fixed: warning on docker container page when array is stopped

---
 plugins/dynamix.docker.manager/Docker.page        | 15 ++++++---------
 .../dynamix.docker.manager/DockerContainers.page  |  2 +-
 plugins/dynamix.vm.manager/VMMachines.page        |  2 +-
 plugins/dynamix.vm.manager/VMs.page               | 14 +++++---------
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/plugins/dynamix.docker.manager/Docker.page b/plugins/dynamix.docker.manager/Docker.page
index c5c06e95b..6ae16307f 100644
--- a/plugins/dynamix.docker.manager/Docker.page
+++ b/plugins/dynamix.docker.manager/Docker.page
@@ -4,8 +4,8 @@ Code="f100"
 Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\")"
 ----
 <?PHP
-/* Copyright 2005-2017, Lime Technology
- * Copyright 2014-2017, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2018, Lime Technology
+ * Copyright 2014-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -16,12 +16,9 @@ Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\
  */
 ?>
 <?
-if ($var['fsState'] != "Started") {
-  echo "<p class='notice shift'>Array must be <span class='strong big'>started</span> to view Docker containers.</p>";
-  return;
-}
-if ( !is_file('/var/run/dockerd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/dockerd.pid'))) ) {
-  echo "<p class='notice shift'>Docker Service failed to start.</p>";
-  return;
+if ($var['fsState'] != 'Started') {
+  echo "<div class='notice shift'>Array must be <span class='strong big'>started</span> to view Docker containers.</div>";
+} elseif (!is_file('/var/run/dockerd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/dockerd.pid')))) {
+  echo "<div class='notice shift'>Docker Service failed to start.</div>";
 }
 ?>
diff --git a/plugins/dynamix.docker.manager/DockerContainers.page b/plugins/dynamix.docker.manager/DockerContainers.page
index 4ce1d9643..e5dfb3edf 100644
--- a/plugins/dynamix.docker.manager/DockerContainers.page
+++ b/plugins/dynamix.docker.manager/DockerContainers.page
@@ -1,7 +1,7 @@
 Menu="Docker:1"
 Title="Docker Containers"
 Tag="cubes"
-Cond="(pgrep('dockerd')!==false)"
+Cond="is_file('/var/run/dockerd.pid')"
 Markdown="false"
 ---
 <?PHP
diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page
index 2b18c2b21..16da72700 100644
--- a/plugins/dynamix.vm.manager/VMMachines.page
+++ b/plugins/dynamix.vm.manager/VMMachines.page
@@ -1,7 +1,7 @@
 Menu="VMs:1"
 Title="Virtual Machines"
 Tag="columns"
-Cond="(pgrep('libvirtd')!==false)"
+Cond="is_file('/var/run/libvirt/libvirtd.pid')"
 Markdown="false"
 ---
 <?PHP
diff --git a/plugins/dynamix.vm.manager/VMs.page b/plugins/dynamix.vm.manager/VMs.page
index 873b86316..ae0061449 100644
--- a/plugins/dynamix.vm.manager/VMs.page
+++ b/plugins/dynamix.vm.manager/VMs.page
@@ -4,8 +4,8 @@ Code="f108"
 Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
 ---
 <?PHP
-/* Copyright 2005-2017, Lime Technology
- * Copyright 2015-2017, Derek Macias, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2018, Lime Technology
+ * Copyright 2015-2018, Derek Macias, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -17,13 +17,9 @@ Cond="exec(\"grep -o '^SERVICE=.enable' /boot/config/domain.cfg 2>/dev/null\")"
 ?>
 <?
 if ($var['fsState'] != "Started") {
-  echo "<p class='notice shift'>Array must be <span class='strong big'>started</span> to view Virtual Machines.</p>";
-  return;
+  echo "<div class='notice shift'>Array must be <span class='strong big'>started</span> to view Virtual Machines.</div>";
+} elseif (!is_file('/var/run/libvirt/libvirtd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/libvirt/libvirtd.pid')))) {
+  echo "<div class='notice shift'>Libvirt Service failed to start.</div>";
 }
-if (!is_file('/var/run/libvirt/libvirtd.pid') || (!is_dir('/proc/'.@file_get_contents('/var/run/libvirt/libvirtd.pid')))) {
-  echo "<p class='notice shift'>Libvirt Service failed to start.</p>";
-  return;
-}
-
 if (count($pages)==2) $tabbed = false;
 ?>
\ No newline at end of file