[dnbd3] Show free space, fix styling, add help texts and strings (de)

2 files changed, 12 insertions, 6 deletions

diff --git a/modules-available/dnbd3/inc/dnbd3rpc.inc.php b/modules-available/dnbd3/inc/dnbd3rpc.inc.php
index 6134489a..27713bfb 100644
--- a/modules-available/dnbd3/inc/dnbd3rpc.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3rpc.inc.php
@@ -5,14 +5,15 @@ class Dnbd3Rpc {
 	/**
 	 * Query given DNBD3 server for status information.
 	 *
+	 * @param string $server server address
+	 * @param int $port server port
 	 * @param bool $stats include general stats
 	 * @param bool $clients include client list
 	 * @param bool $images include image list
-	 * @param string $server server address
-	 * @param int $port server port
+	 * @param bool $diskSpace include disk space stats
 	 * @return false|array the queried data as an array, or false on error
 	 */
-	public static function query($stats, $clients, $images, $server, $port = 5003)
+	public static function query($server, $port, $stats, $clients, $images, $diskSpace)
 	{
 		// Special case - local server
 		if ($server === '<self>') {
@@ -28,6 +29,9 @@ class Dnbd3Rpc {
 		if ($images) {
 			$url .= 'q=images&';
 		}
+		if ($diskSpace) {
+			$url .= 'q=space&';
+		}
 		$str = Download::asString($url, 3, $code);
 		if ($str === false || $code !== 200)
 			return false;
diff --git a/modules-available/dnbd3/inc/dnbd3util.inc.php b/modules-available/dnbd3/inc/dnbd3util.inc.php
index 45ae6135..ae5e0cd7 100644
--- a/modules-available/dnbd3/inc/dnbd3util.inc.php
+++ b/modules-available/dnbd3/inc/dnbd3util.inc.php
@@ -49,7 +49,7 @@ class Dnbd3Util {
 		// Now query them all
 		$NOW = time();
 		foreach ($servers as $server) {
-			$data = Dnbd3Rpc::query(true, false, false, $server['addr']);
+			$data = Dnbd3Rpc::query($server['addr'], 5003, true, false, false, true);
 			if (!is_array($data) || !isset($data['runId'])) {
 				Database::exec('UPDATE dnbd3_server SET uptime = 0, clientcount = 0 WHERE serverid = :serverid',
 					array('serverid' => $server['serverid']));
@@ -60,7 +60,7 @@ class Dnbd3Util {
 			Database::exec('UPDATE dnbd3_server SET runid = :runid, lastseen = :now, uptime = :uptime,
 				totalup = totalup + If(runid = :runid AND uptime <= :uptime, If(lastup < :up, :up - lastup, 0), If(:uptime < 1800, :up, 0)),
 				totaldown = totaldown + If(runid = :runid AND uptime <= :uptime, If(lastdown < :down, :down - lastdown, 0), If(:uptime < 1800, :up, 0)),
-				lastup = :up, lastdown = :down, clientcount = :clientcount
+				lastup = :up, lastdown = :down, clientcount = :clientcount, disktotal = :disktotal, diskfree = :diskfree
 				WHERE serverid = :serverid', array(
 					'runid' => $data['runId'],
 					'now' => $NOW,
@@ -68,7 +68,9 @@ class Dnbd3Util {
 					'up' => $data['bytesSent'],
 					'down' => $data['bytesReceived'],
 					'clientcount' => $data['clientCount'],
-					'serverid' => $server['serverid']
+					'serverid' => $server['serverid'],
+					'disktotal' => $data['spaceTotal'],
+					'diskfree' => $data['spaceFree'],
 			));
 		}
 	}