From a079dcffbc8be5a0f1cd1e99d1a1bb69406c6ade Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 13 Jun 2023 12:18:59 +0200
Subject: [dnbd3] Add option to prefer satellite server for initial connection

---
 modules-available/dnbd3/page.inc.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 f8cabca5..d60b3dfa 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -25,7 +25,7 @@ class Page_Dnbd3 extends Page
 		} elseif ($action === 'savelocations') {
 			$this->saveServerLocations();
 		} elseif ($action === 'toggle-usage') {
-			$this->toggleUsage();
+			$this->saveGenericSettings();
 		}
 		if (Request::isPost()) {
 			Util::redirect('?do=dnbd3');
@@ -77,13 +77,15 @@ class Page_Dnbd3 extends Page
 			json_encode(compact('bgr', 'firewall', 'advancedSettings')), false);
 	}
 
-	private function toggleUsage()
+	private function saveGenericSettings()
 	{
 		User::assertPermission('toggle-usage');
 		$enabled = Request::post('enabled', false, 'bool');
 		$nfs = Request::post('with-nfs', false, 'bool');
+		$preferLocal = Request::post('prefer-local', false, 'bool');
 		Dnbd3::setEnabled($enabled);
 		Dnbd3::setNfsFallback($nfs);
+		Dnbd3::setPreferLocal($preferLocal);
 	}
 
 	private function saveServerLocations()
@@ -208,7 +210,7 @@ class Page_Dnbd3 extends Page
 				$server['diskUsePercent'] = 0;
 			}
 			$server['self'] = ($server['fixedip'] === '<self>');
-			if (isset($server['clientip']) && !is_null($server['clientip'])) {
+			if (isset($server['clientip'])) {
 				if ($NOW - $server['lastseen'] > 360) {
 					$server['slxDown'] = true;
 				} else {
@@ -251,6 +253,7 @@ class Page_Dnbd3 extends Page
 			'enabled' => Dnbd3::isEnabled(),
 			'enabled_checked_s' => Dnbd3::isEnabled() ? 'checked' : '',
 			'nfs_checked_s' => Dnbd3::hasNfsFallback() ? 'checked' : '',
+			'local_checked_s' => Dnbd3::preferLocal() ? 'checked' : '',
 			'rebootcontrol' => Module::isAvailable('rebootcontrol', false)
 		);
 		Permission::addGlobalTags($data['perms'], null, ['view.details', 'refresh', 'toggle-usage', 'configure.proxy', 'configure.external']);
-- 
cgit v1.2.3-55-g7522