From 03424ad19ac1bb42635a3d6653565aa0dc6ccf5a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 25 Mar 2019 11:46:50 +0100
Subject: Introduce JS helper for bootstrap confirm dialogs on button-submit

---
 modules-available/locationinfo/page.inc.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/modules-available/locationinfo/page.inc.php b/modules-available/locationinfo/page.inc.php
index 3e17976d..d1644ce1 100644
--- a/modules-available/locationinfo/page.inc.php
+++ b/modules-available/locationinfo/page.inc.php
@@ -22,21 +22,26 @@ class Page_LocationInfo extends Page
 		$action = Request::post('action');
 		if ($action === 'writePanelConfig') {
 			$this->writePanelConfig();
+			$show = 'panels';
 		} elseif ($action === 'writeLocationConfig') {
 			$this->writeLocationConfig();
 			$show = 'locations';
-		} elseif ($action === 'deleteServer') {
-			$this->deleteServer();
 		} elseif ($action === 'deletePanel') {
 			$this->deletePanel();
-		} elseif ($action === 'checkConnection') {
-			$this->checkConnection(Request::post('serverid', 0, 'int'));
-			$show = 'backends';
+			$show = 'panels';
 		} elseif ($action === 'updateServerSettings') {
 			$this->updateServerSettings();
 			$show = 'backends';
-		} elseif (Request::isPost()) {
-			Message::addWarning('main.invalid-action', $action);
+		} else {
+			if (($id = Request::post('del-serverid', false, 'int')) !== false) {
+				$this->deleteServer($id);
+				$show = 'backends';
+			} elseif (($id = Request::post('chk-serverid', false, 'int')) !== false) {
+				$this->checkConnection($id);
+				$show = 'backends';
+			} elseif (Request::isPost()) {
+				Message::addWarning('main.invalid-action', $action);
+			}
 		}
 		if (Request::isPost() || $this->show === false) {
 			if (!empty($show)) {
@@ -95,11 +100,10 @@ class Page_LocationInfo extends Page
 	/**
 	 * Deletes the server from the db.
 	 */
-	private function deleteServer()
+	private function deleteServer($id)
 	{
 		User::assertPermission('backend.edit');
-		$id = Request::post('serverid', false, 'int');
-		if ($id === false) {
+		if ($id === 0) {
 			Message::addError('server-id-missing');
 			return;
 		}
-- 
cgit v1.2.3-55-g7522