From fe6ac16498b05d0f0c8ed7fda394273815d3d6da Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 23 May 2014 20:49:02 +0200
Subject: Stuff (WIP)

---
 modules/serversetup.inc.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'modules/serversetup.inc.php')

diff --git a/modules/serversetup.inc.php b/modules/serversetup.inc.php
index 3f2b8768..daa3b4e8 100644
--- a/modules/serversetup.inc.php
+++ b/modules/serversetup.inc.php
@@ -13,7 +13,7 @@ class Page_ServerSetup extends Page
 			Message::addError('no-permission');
 			Util::redirect('?do=Main');
 		}
-
+		
 		$this->currentAddress = Property::getServerIp();
 		$newAddress = Request::post('ip', 'none');
 		
@@ -23,7 +23,7 @@ class Page_ServerSetup extends Page
 			Util::redirect('?do=Main');
 		}
 		
-		if ($this->taskStatus['statusCode'] === TASK_WAITING) {
+		if ($this->taskStatus['statusCode'] === TASK_WAITING) { // TODO: Async if just displaying
 			$this->taskStatus = Taskmanager::waitComplete($this->taskStatus['id']);
 		}
 		
@@ -54,6 +54,7 @@ class Page_ServerSetup extends Page
 			}
 			if ($valid) {
 				Property::setServerIp($newAddress);
+				Trigger::ipxe();
 			} else {
 				Message::addError('invalid-ip', $newAddress);
 			}
@@ -64,9 +65,13 @@ class Page_ServerSetup extends Page
 	
 	protected function doRender()
 	{
-		Render::addTemplate('page-serversetup', array(
+		Render::addTemplate('serversetup/ipaddress', array(
 			'ips' => $this->taskStatus['data']['addresses'],
 			'token' => Session::get('token')
 		));
+		Render::addTemplate('serversetup/ipxe', array(
+			'token' => Session::get('token'),
+			'taskid' => Property::getIPxeTaskId()
+		));
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522