Add HTTPS config module for webif, update everything to use FileUtil class, minor fixes

1 files changed, 1 insertions, 33 deletions

diff --git a/modules/backup.inc.php b/modules/backup.inc.php
index ecdc3565..e3652ebe 100644
--- a/modules/backup.inc.php
+++ b/modules/backup.inc.php
@@ -84,7 +84,7 @@ class Page_Backup extends Page
 			Util::redirect('?do=Backup');
 		}
 		// Got uploaded file, now shut down all the daemons etc.
-		$parent = $this->stopDaemons(null);
+		$parent = Trigger::stopDaemons(null, &$this->templateData);
 		// Unmount store
 		$task = Taskmanager::submit('MountVmStore', array(
 				'address' => 'null',
@@ -116,36 +116,4 @@ class Page_Backup extends Page
 			$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;
-	}
-
 }