From 0550ff7dcf5162f446188de264fe26f3b302117c Mon Sep 17 00:00:00 2001
From: TimZ99 <TimZ99@users.noreply.github.com>
Date: Wed, 15 Jan 2020 10:33:47 +0100
Subject: [PATCH 1/2] Added ping error

---
 src/psm/Util/Server/Updater/StatusUpdater.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/psm/Util/Server/Updater/StatusUpdater.php b/src/psm/Util/Server/Updater/StatusUpdater.php
index 24d37cd8..8dfa421f 100644
--- a/src/psm/Util/Server/Updater/StatusUpdater.php
+++ b/src/psm/Util/Server/Updater/StatusUpdater.php
@@ -175,7 +175,9 @@ class StatusUpdater
         if ($max_runs == null || $max_runs > 1) {
             $max_runs = 1;
         }
-        $txt = exec("ping -c " . $max_runs . " " . $this->server['ip']);
+        $result = null;
+        // Execute ping
+        $txt = exec("ping -c " . $max_runs . " " . $this->server['ip'] . " 2>&1", $output);
         // Non-greedy match on filler
         $re1 = '.*?';
         // Uninteresting: float
@@ -184,16 +186,16 @@ class StatusUpdater
         $re3 = '.*?';
         // Float 1
         $re4 = '([+-]?\\d*\\.\\d+)(?![-+0-9\\.])';
-
-        if ($c = preg_match_all("/" . $re1 . $re2 . $re3 . $re4 . "/is", $txt, $matches)) {
+        if (preg_match_all("/" . $re1 . $re2 . $re3 . $re4 . "/is", $txt, $matches)) {
             $result = $matches[1][0];
-        } else {
-            $result = null;
         }
 
         if (!is_null($result)) {
+            $this->header = $output[0];
             $status = true;
         } else {
+            $this->header = "-";
+            $this->error = $output[0];
             $status = false;
         }
         //Divide by a thousand to convert to milliseconds

From 676e80d42f100353509178eb040e8b1d12df3b77 Mon Sep 17 00:00:00 2001
From: TimZ99 <TimZ99@users.noreply.github.com>
Date: Wed, 15 Jan 2020 23:15:30 +0100
Subject: [PATCH 2/2] Improved servers table layout

Fixes #779.

Co-Authored-By: James <jigr1969@users.noreply.github.com>
---
 .../module/server/server/list.tpl.html        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/templates/default/module/server/server/list.tpl.html b/src/templates/default/module/server/server/list.tpl.html
index 17c6262d..3a01ac82 100644
--- a/src/templates/default/module/server/server/list.tpl.html
+++ b/src/templates/default/module/server/server/list.tpl.html
@@ -5,17 +5,17 @@
 		<thead>
 			<tr>
 				<!--class="d-none d-lg-table-cell"-->
-				<th scope="col">{{ label_label }}</th>
-				<th scope="col">{{ label_domain }}</th>
-				<th scope="col">{{ label_port }}</th>
-				<th scope="col">{{ label_type }}</th>
-				<th scope="col">{{ label_rtime }}</th>
-				<th scope="col">{{ label_last_online }}</th>
-				<th scope="col">{{ label_last_offline }}</th>
-				<th scope="col">{{ label_monitoring }}</th>
-				{% if user_level == 10 %}
-				<th scope="col">&#32</th>
-				{% endif %}
+                <th scope="col">{{ label_label }}</th>
+                <th scope="col">{{ label_domain }}</th>
+                <th scope="col" style="width: 5%;">{{ label_port }}</th>
+                <th scope="col" style="width: 8%;">{{ label_type }}</th>
+                <th scope="col" style="width: 8%;">{{ label_rtime }}</th>
+                <th scope="col" style="width: 10%;">{{ label_last_online }}</th>
+                <th scope="col" style="width: 10%;">{{ label_last_offline }}</th>
+                <th scope="col" style="width: 10%;">{{ label_monitoring }}</th>
+                {% if user_level == 10 %}
+                <th scope="col" style="width: 5%;">&#32</th>
+                {% endif %}
 			</tr>
 			<tr class="warning no-result">
 					<td colspan="9"><i class="fas fa-exclamation-triangle"></i> No result</td>