diff options
| author | OpenSLX | 2010-01-20 18:06:43 +0100 |
|---|---|---|
| committer | OpenSLX | 2010-01-20 18:06:43 +0100 |
| commit | 954e87b11b3f20d43186039a6e4193b52420c935 (patch) | |
| tree | e38bd9e58488c2c6c9db8f50a63f178fe1202c14 | |
| parent | added delete function for menu assignments (diff) | |
| download | pbs-954e87b11b3f20d43186039a6e4193b52420c935.tar.gz pbs-954e87b11b3f20d43186039a6e4193b52420c935.tar.xz pbs-954e87b11b3f20d43186039a6e4193b52420c935.zip | |
minor bugfix
| -rw-r--r-- | application/controllers/IndexController.php | 4 | ||||
| -rw-r--r-- | application/modules/bootloader/controllers/EnvController.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index 333b38e..def0377 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -20,8 +20,8 @@ class IndexController extends Zend_Controller_Action "Home" => "/", "Bootmedia" => "/index/bootmedia", "Menus" => "/index/menu", - "Menu Assignment" => "/index/menuassignment", - "Systeminfo" => "/index/sysinfo" + "Menu Assignment" => "/index/menuassignment"#, +# "Systeminfo" => "/index/sysinfo" ); } diff --git a/application/modules/bootloader/controllers/EnvController.php b/application/modules/bootloader/controllers/EnvController.php index aba575b..d199650 100644 --- a/application/modules/bootloader/controllers/EnvController.php +++ b/application/modules/bootloader/controllers/EnvController.php @@ -62,10 +62,10 @@ class Bootloader_EnvController extends Zend_Controller_Action foreach ($data as $d) { if ($this->_ip_netmask_check($_SERVER['REMOTE_ADDR'], $d['i_ip'], $d['i_netmask'])) { - if ($pbs_id == $d['b_identifier']) $r[4][] = $d['menu_id']; + if ($mid == $d['b_identifier']) $r[4][] = $d['menu_id']; else $r[3][] = $d['menu_id']; } else { - if ($pbs_id == $d['b_identifier']) $r[2][] = $d['menu_id']; + if ($mid == $d['b_identifier']) $r[2][] = $d['menu_id']; else $r[1][] = $d['menu_id']; } } |