summaryrefslogtreecommitdiffstats
path: root/modules/serversetup.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'modules/serversetup.inc.php')
-rw-r--r--modules/serversetup.inc.php11
1 files changed, 8 insertions, 3 deletions
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