[backup/systemstatus] Show up/downloads in backup page

Add AJAX API to dozmod module to query the fileserver status
of dmsd.

7 files changed, 34 insertions, 44 deletions

diff --git a/modules-available/systemstatus/lang/de/messages.json b/modules-available/systemstatus/lang/de/messages.json
index 1a6df1b3..44e4fad1 100644
--- a/modules-available/systemstatus/lang/de/messages.json
+++ b/modules-available/systemstatus/lang/de/messages.json
@@ -1,4 +1,3 @@
 {
-    "reboot-unconfirmed": "Sicherheitsabfrage zum Reboot nicht best\u00e4tigt",
     "update-reboot-required": "Das Update der folgenden Pakete erfordert einen Reboot des Servers: {{0}}"
 }
\ No newline at end of file
diff --git a/modules-available/systemstatus/lang/de/template-tags.json b/modules-available/systemstatus/lang/de/template-tags.json
index eeb75f9a..27760c1e 100644
--- a/modules-available/systemstatus/lang/de/template-tags.json
+++ b/modules-available/systemstatus/lang/de/template-tags.json
@@ -7,7 +7,6 @@
     "lang_capacity": "Kapazit\u00e4t",
     "lang_cpuLoad": "CPU-Last",
     "lang_dmsdUnreachable": "dmsd nicht erreichbar",
-    "lang_downloads": "Downloads",
     "lang_failure": "Fehler",
     "lang_foundStore": "Vorgefunden:",
     "lang_free": "Frei",
@@ -20,6 +19,8 @@
     "lang_onlyOS": "Nur OS",
     "lang_overview": "\u00dcbersicht",
     "lang_ramUsage": "RAM-Nutzung",
+    "lang_runningDownloads": "Aktive Downloads",
+    "lang_runningUploads": "Aktive Uploads",
     "lang_serverReboot": "Server neustarten",
     "lang_services": "Dienste",
     "lang_space": "Speicherplatz",
@@ -33,7 +34,6 @@
     "lang_total": "Gesamt",
     "lang_unknownState": "Unbekannter Status",
     "lang_updatedPackages": "Ausstehende Updates",
-    "lang_uploads": "Uploads",
     "lang_uptimeOS": "OS Uptime",
     "lang_vmStore": "VM-Speicher",
     "lang_vmStoreError": "Fehler beim Ermitteln des verf\u00fcgbaren Speicherplatzes am VM-Speicherort. Bitte \u00fcberpr\u00fcfen Sie die Konfiguration."
diff --git a/modules-available/systemstatus/lang/en/messages.json b/modules-available/systemstatus/lang/en/messages.json
index 5098eb76..c38c8e66 100644
--- a/modules-available/systemstatus/lang/en/messages.json
+++ b/modules-available/systemstatus/lang/en/messages.json
@@ -1,4 +1,3 @@
 {
-    "reboot-unconfirmed": "Confirmation prompt to reboot not confirmed",
     "update-reboot-required": "Updating the following system packages requires reboot: {{0}}"
 }
\ No newline at end of file
diff --git a/modules-available/systemstatus/lang/en/template-tags.json b/modules-available/systemstatus/lang/en/template-tags.json
index 5f6ad898..90e0576a 100644
--- a/modules-available/systemstatus/lang/en/template-tags.json
+++ b/modules-available/systemstatus/lang/en/template-tags.json
@@ -7,7 +7,6 @@
     "lang_capacity": "Capacity",
     "lang_cpuLoad": "CPU Load",
     "lang_dmsdUnreachable": "dmsd not reachable",
-    "lang_downloads": "Downloads",
     "lang_failure": "Failure",
     "lang_foundStore": "Found:",
     "lang_free": "Free",
@@ -20,6 +19,8 @@
     "lang_onlyOS": "OS Only",
     "lang_overview": "Overview",
     "lang_ramUsage": "RAM Usage",
+    "lang_runningDownloads": "Running downloads",
+    "lang_runningUploads": "Running uploads",
     "lang_serverReboot": "Reboot Server",
     "lang_services": "Services",
     "lang_space": "Space",
@@ -33,7 +34,6 @@
     "lang_total": "Total",
     "lang_unknownState": "Unknown status",
     "lang_updatedPackages": "Pending updates",
-    "lang_uploads": "Uploads",
     "lang_uptimeOS": "OS Uptime",
     "lang_vmStore": "VM Store",
     "lang_vmStoreError": "Error determining available space of the VM storage. Please check the configuration."
diff --git a/modules-available/systemstatus/page.inc.php b/modules-available/systemstatus/page.inc.php
index 74ed3f47..6876d0b5 100644
--- a/modules-available/systemstatus/page.inc.php
+++ b/modules-available/systemstatus/page.inc.php
@@ -37,6 +37,11 @@ class Page_SystemStatus extends Page
 			);
 		}
 		Permission::addGlobalTags($data['perms'], null, ['serverreboot']);
+		if (file_exists('/run/reboot-required.pkgs')) {
+			$lines = file('/run/reboot-required.pkgs', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+			$lines = array_unique($lines);
+			$data['packages'] = implode(', ', $lines);
+		}
 		Render::addTemplate('_page', $data);
 	}
 
@@ -55,28 +60,6 @@ class Page_SystemStatus extends Page
 			echo "Action $action not known in " . get_class();
 		}
 	}
-	
-	protected function ajaxDmsdUsers()
-	{
-		User::assertPermission("show.overview.dmsdusers");
-		$ret = Download::asStringPost('http://127.0.0.1:9080/status/fileserver', false, 2, $code);
-		$args = array();
-		if ($code != 200) {
-			$args['dmsd_error'] = true;
-		} else {
-			$data = @json_decode($ret, true);
-			if (is_array($data)) {
-				$args['uploads'] = $data['activeUploads'];
-				$args['downloads'] = $data['activeDownloads'];
-			}
-		}
-		if (file_exists('/run/reboot-required.pkgs')) {
-			$lines = file('/run/reboot-required.pkgs', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-			$lines = array_unique($lines);
-			$args['packages'] = implode(', ', $lines);
-		}
-		echo Render::parse('ajax-reboot', $args);
-	}
 
 	protected function ajaxDiskStat()
 	{
diff --git a/modules-available/systemstatus/templates/_page.html b/modules-available/systemstatus/templates/_page.html
index 3d0f9dfb..f879ea7a 100644
--- a/modules-available/systemstatus/templates/_page.html
+++ b/modules-available/systemstatus/templates/_page.html
@@ -100,7 +100,16 @@
 							</button>
 							<div class="hidden" id="confirm-reboot">{{lang_areYouSureReboot}}</div>
 						</form>
-						<div id="dmsd-users"></div>
+						<div id="dmsd-users">
+							{{lang_runningUploads}}: <span class="uploads">??</span>,
+							{{lang_runningDownloads}}: <span class="downloads">??</span>
+							<div class="alert alert-warning collapse">{{lang_dmsdUnreachable}}</div>
+						</div>
+						<div>
+							{{#packages}}
+							{{lang_updatedPackages}}: {{packages}}
+							{{/packages}}
+						</div>
 					</div>
 				</div>
 			</div>
@@ -123,7 +132,6 @@
 		$('#addresses').load('?do=SystemStatus&action=AddressList');
 		$('#systeminfo').load('?do=SystemStatus&action=SystemInfo');
 		$('#services').load('?do=SystemStatus&action=Services');
-		$('#dmsd-users').load('?do=SystemStatus&action=DmsdUsers');
 		var slxDone = {};
 		$('.ajax-tab').on('shown.bs.tab', function (e) {
 			var $this = $(this);
@@ -134,5 +142,20 @@
 				$pane.load('?do=SystemStatus&action=' + w.substring(3));
 			}
 		});
+		var $dmsd = $('#dmsd-users');
+		$.ajax({
+			url: '?do=dozmod&section=special&action=dmsd-status',
+			timeout: 3000,
+			dataType: 'json'
+		}).done(function (data) {
+			if (!data || data.error) {
+				$dmsd.find('.alert').show();
+			} else {
+				if (data.downloads !== null) $dmsd.find('.downloads').text(data.downloads);
+				if (data.uploads !== null) $dmsd.find('.uploads').text(data.uploads);
+			}
+		}).fail(function () {
+			$dmsd.find('.alert').show();
+		});
 	}, false);
 //--></script>
diff --git a/modules-available/systemstatus/templates/ajax-reboot.html b/modules-available/systemstatus/templates/ajax-reboot.html
deleted file mode 100644
index a1aaf1e6..00000000
--- a/modules-available/systemstatus/templates/ajax-reboot.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div>
-	{{^dmsd_error}}
-		{{lang_uploads}}: {{uploads}},
-		{{lang_downloads}}: {{downloads}}
-	{{/dmsd_error}}
-	{{#dmsd_error}}
-		<div class="alert alert-warning">{{lang_dmsdUnreachable}}</div>
-	{{/dmsd_error}}
-</div>
-<div>
-	{{#packages}}
-		{{lang_updatedPackages}}: {{packages}}
-	{{/packages}}
-</div>
\ No newline at end of file