diff options
| author | Simon Rettberg | 2014-06-23 18:07:32 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-06-23 18:07:32 +0200 |
| commit | 84de107d42acfbd22be43c5e766b89531fc53c3e (patch) | |
| tree | 17ae0a6eb24ea7177d9f5148ef5f07419a0b8899 /modules | |
| parent | minor (diff) | |
| download | slx-admin-84de107d42acfbd22be43c5e766b89531fc53c3e.tar.gz slx-admin-84de107d42acfbd22be43c5e766b89531fc53c3e.tar.xz slx-admin-84de107d42acfbd22be43c5e766b89531fc53c3e.zip | |
Get rid of pxe menu ip tracking, not needed in the future
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/main.inc.php | 2 | ||||
| -rw-r--r-- | modules/serversetup.inc.php | 4 | ||||
| -rw-r--r-- | modules/sysconfig.inc.php | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/modules/main.inc.php b/modules/main.inc.php index 232d6a0a..42a980e3 100644 --- a/modules/main.inc.php +++ b/modules/main.inc.php @@ -17,13 +17,11 @@ class Page_Main extends Page return; } // Logged in here - $ipxe = (Property::getServerIp() !== Property::getIPxeIp()); $sysconfig = !file_exists(CONFIG_HTTP_DIR . '/default/config.tgz'); $minilinux = !file_exists(CONFIG_HTTP_DIR . '/default/kernel') || !file_exists(CONFIG_HTTP_DIR . '/default/initramfs-stage31') || !file_exists(CONFIG_HTTP_DIR . '/default/stage32.sqfs'); $vmstore = !is_array(Property::getVmStoreConfig()); Render::addTemplate('page-main', array( 'user' => User::getName(), - 'ipxe' => $ipxe, 'sysconfig' => $sysconfig, 'minilinux' => $minilinux, 'vmstore' => $vmstore diff --git a/modules/serversetup.inc.php b/modules/serversetup.inc.php index c03fe9e3..527c0940 100644 --- a/modules/serversetup.inc.php +++ b/modules/serversetup.inc.php @@ -45,7 +45,6 @@ class Page_ServerSetup extends Page 'ips' => $this->taskStatus['data']['addresses'] )); $data = $this->currentMenu; - $data['taskid'] = Property::getIPxeTaskId(); if (!isset($data['defaultentry'])) $data['defaultentry'] = 'net'; if ($data['defaultentry'] === 'net') @@ -101,7 +100,6 @@ class Page_ServerSetup extends Page } if ($valid) { Property::setServerIp($newAddress); - Trigger::ipxe(); } else { Message::addError('invalid-ip', $newAddress); } @@ -120,7 +118,7 @@ class Page_ServerSetup extends Page $this->currentMenu['timeout'] = $timeout; $this->currentMenu['custom'] = Request::post('custom', ''); Property::setBootMenu($this->currentMenu); - Trigger::ipxe(true); + Trigger::ipxe(); Util::redirect('?do=ServerSetup'); } diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php index 485f2394..5e483e55 100644 --- a/modules/sysconfig.inc.php +++ b/modules/sysconfig.inc.php @@ -48,7 +48,7 @@ class Page_SysConfig extends Page if (!User::hasPermission('superadmin')) { Message::addError('no-permission'); - Util::redirect('?do=SysConfig'); + Util::redirect('?do=Main'); } $action = Request::any('action', 'list'); |