From 9d6af837983261c0f35dc64e075e4f6917784eca Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 2 Jun 2014 16:03:40 +0200
Subject: Zeug

---
 inc/property.inc.php | 12 +++++++++++-
 inc/trigger.inc.php  |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'inc')

diff --git a/inc/property.inc.php b/inc/property.inc.php
index 77d2b985..0aa1841e 100644
--- a/inc/property.inc.php
+++ b/inc/property.inc.php
@@ -45,7 +45,7 @@ class Property
 			. " ON DUPLICATE KEY UPDATE value = VALUES(value), dateline = VALUES(dateline)", array(
 			'key' => $key,
 			'value' => $value,
-			'dateline' => time() + ($minage * 60)
+			'dateline' => ($minage === 0 ? 0 : time() + ($minage * 60))
 		));
 		if (self::$cache !== false) {
 			self::$cache[$key] = $value;
@@ -139,4 +139,14 @@ class Property
 		self::set('vmstore-config', json_encode($value));
 	}
 
+	public static function getDownloadTask($name)
+	{
+		return self::get('dl-' . $name);
+	}
+	
+	public static function setDownloadTask($name, $taskId)
+	{
+		self::set('dl-' . $name, $taskId, 5);
+	}
+
 }
diff --git a/inc/trigger.inc.php b/inc/trigger.inc.php
index b7cc67cc..c22f8c5b 100644
--- a/inc/trigger.inc.php
+++ b/inc/trigger.inc.php
@@ -67,7 +67,7 @@ class Trigger
 		if ($storetype === 'nfs') $addr = $vmstore['nfsaddr'];
 		if ($storetype === 'cifs') $addr = $vmstore['cifsaddr'];
 		if ($storetype === 'internal') $addr = 'none';
-		$this->mountTask = Taskmanager::submit('MountVmStore', array(
+		return Taskmanager::submit('MountVmStore', array(
 			'address' => $addr,
 			'type' => 'images',
 			'username' => $vmstore['cifsuser'],
-- 
cgit v1.2.3-55-g7522