From dea102b864b97ef5ed944298ca0879ccd117ee07 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 30 Oct 2020 14:32:39 +0100
Subject: [dnbd3] Link from image list to client list

---
 modules-available/dnbd3/page.inc.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'modules-available/dnbd3/page.inc.php')

diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index 96f72c3b..7721dac1 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -276,15 +276,6 @@ class Page_Dnbd3 extends Page
 		$stats['tab_altservers'] = is_array($stats['altservers']);
 		Render::addTemplate('page-proxy-stats', $stats);
 		Render::openTag('div', ['class' => 'tab-content']);
-		$ips = array();
-		$sort = array();
-		foreach ($stats['clients'] as &$c) {
-			$c['bytesSent_s'] = Util::readableFileSize($c['bytesSent']);
-			$sort[] = $c['bytesSent'];
-			$ips[preg_replace('/:\d+$/', '', $c['address'])] = true;
-		}
-		$ips = array_keys($ips);
-		array_multisort($sort, SORT_DESC, $stats['clients']);
 		// Config
 		if (is_string($stats['config'])) {
 			preg_match_all('/^((?<sec>\[.*\])|(?<key>[^=]+)=(?<val>.*)|(?<other>[^\[][^=]*))$/m', $stats['config'], $out, PREG_SET_ORDER);
@@ -333,6 +324,17 @@ class Page_Dnbd3 extends Page
 			unset($as);
 			Render::addTemplate('page-proxy-altservers', $stats);
 		}
+		// CLIENT TAB
+		$ips = array();
+		$sort = array();
+		foreach ($stats['clients'] as &$c) {
+			$c['bytesSent_s'] = Util::readableFileSize($c['bytesSent']);
+			$sort[] = $c['bytesSent'];
+			$c['ip'] = preg_replace('/:\d+$/', '', $c['address']);
+			$ips[$c['ip']] = true;
+		}
+		$ips = array_keys($ips);
+		array_multisort($sort, SORT_DESC, $stats['clients']);
 		// Count locations
 		$res = Database::simpleQuery("SELECT locationid, Count(*) AS cnt FROM machine
 				WHERE clientip IN (:ips) AND state IN ('IDLE', 'OCCUPIED') GROUP BY locationid", compact('ips'));
-- 
cgit v1.2.3-55-g7522