From 9df060fd3d5a840b60505cbebd4619a66c1a0cbf Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Tue, 13 Sep 2016 12:05:38 -0400
Subject: [PATCH] Cleanup a couple backend API calls: 1) In the system manager
 "process info" function, use the -a flag for top so we get the whole command
 instead of just the first binary. 2)Cleanup a bit more of the backend of the
 new firewall manager.

---
 src/server/library/sysadm-firewall.cpp      | 7 +++----
 src/server/library/sysadm-systemmanager.cpp | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/server/library/sysadm-firewall.cpp b/src/server/library/sysadm-firewall.cpp
index f02c01c..73dfd30 100644
--- a/src/server/library/sysadm-firewall.cpp
+++ b/src/server/library/sysadm-firewall.cpp
@@ -256,10 +256,9 @@ void Firewall::SaveOpenPorts(QList<PortInfo> openports)
         file.close();
       }
       //Re-load/start rules (just in case - it is a smart script)
-      if(IsRunning())
-      {
-          QStringList args;
+      if(IsRunning()){ Restart(); }
+         /* QStringList args;
           args << "/usr/local/share/pcbsd/scripts/reset-firewall";
           General::RunCommand("sh",args);
-      }
+      }*/
 }
diff --git a/src/server/library/sysadm-systemmanager.cpp b/src/server/library/sysadm-systemmanager.cpp
index 9e155e2..2c169ae 100644
--- a/src/server/library/sysadm-systemmanager.cpp
+++ b/src/server/library/sysadm-systemmanager.cpp
@@ -257,7 +257,7 @@ QJsonObject SysMgmt::memoryStats() {
 QJsonObject SysMgmt::procInfo() {
   QJsonObject retObject;
   QStringList output;
-  output = General::RunCommand("top -t -n all").split("\n");
+  output = General::RunCommand("top -t -n -a all").split("\n");
   bool inSection = false;
   for(int i=0; i<output.length(); i++){
     if (output.at(i).contains("PID") && output.at(i).contains("USERNAME")){