From cd55ead3e2810e209b726faca12fa749f6875d0f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 16 Dec 2017 18:33:16 +0100
Subject: Fix A LOT of type problems, logic flaws, uninitialized variables etc.

Most of them were found by phpstorm, so I put in some time and
went through the list, fixing quite a bunch of them.
---
 modules-available/backup/page.inc.php           | 32 +------------------------
 modules-available/backup/templates/restore.html |  3 ++-
 2 files changed, 3 insertions(+), 32 deletions(-)

(limited to 'modules-available/backup')

diff --git a/modules-available/backup/page.inc.php b/modules-available/backup/page.inc.php
index 26182ca3..949cd7f3 100644
--- a/modules-available/backup/page.inc.php
+++ b/modules-available/backup/page.inc.php
@@ -139,35 +139,5 @@ class Page_Backup extends Page
 		if (isset($task['id']))
 			$this->templateData['rebootid'] = $task['id'];
 	}
-	private function stopDaemons($parent)
-	{
-		$task = Taskmanager::submit('SyncdaemonLauncher', array(
-				'operation' => 'stop',
-				'parentTask' => $parent,
-				'failOnParentFail' => false
-		));
-		if (isset($task['id'])) {
-			$this->templateData['syncid'] = $task['id'];
-			$parent = $task['id'];
-		}
-		$task = Taskmanager::submit('DozmodLauncher', array(
-				'operation' => 'stop',
-				'parentTask' => $parent,
-				'failOnParentFail' => false
-		));
-		if (isset($task['id'])) {
-			$this->templateData['dmsdid'] = $task['id'];
-			$parent = $task['id'];
-		}
-		$task = Taskmanager::submit('LdadpLauncher', array(
-				'ids' => array(),
-				'parentTask' => $parent,
-				'failOnParentFail' => false
-		));
-		if (isset($task['id'])) {
-			$this->templateData['ldadpid'] = $task['id'];
-			$parent = $task['id'];
-		}
-		return $parent;
-	}
+
 }
diff --git a/modules-available/backup/templates/restore.html b/modules-available/backup/templates/restore.html
index 4494a993..5de7d1cc 100644
--- a/modules-available/backup/templates/restore.html
+++ b/modules-available/backup/templates/restore.html
@@ -2,8 +2,8 @@
 	<div class="panel-heading">{{lang_backup}}</div>
 	<div class="panel-body">
 		<div id="zeug">
-			<div data-tm-id="{{syncid}}" data-tm-log="messages">{{lang_stopping}} syncdaemon</div>
 			<div data-tm-id="{{dmsdid}}" data-tm-log="messages">{{lang_stopping}} dmsd</div>
+			<div data-tm-id="{{dnbd3id}}" data-tm-log="messages">{{lang_stopping}} DNBD3</div>
 			<div data-tm-id="{{ldadpid}}" data-tm-log="messages">{{lang_stopping}} ldadp</div>
 			<div data-tm-id="{{mountid}}" data-tm-log="messages">{{lang_stopping}} vmstore</div>
 			<div data-tm-id="{{restoreid}}" data-tm-log="messages" data-tm-callback="restoreCb">{{lang_restoreConfig}}</div>
@@ -19,6 +19,7 @@
 </div>
 
 <script type="text/javascript">
+	var slxDotInterval = false;
 	function restoreCb(task)
 	{
 		if (!task || !task.statusCode)
-- 
cgit v1.2.3-55-g7522