From fbac6fb1a645ee69c9848a0adb2d939d1cdf69ff Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Wed, 12 Apr 2017 09:32:13 +0200 Subject: [PATCH] expand product info to MVC view; closes #1446 There is still some glue in the product info that is irrelevant to the product. Will be removed eventually. --- .../mvc/app/controllers/OPNsense/Base/ControllerBase.php | 5 +++++ src/opnsense/mvc/app/views/layouts/default.volt | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php index ac4a8a142..832d0073e 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Base/ControllerBase.php @@ -221,6 +221,11 @@ class ControllerBase extends ControllerRoot $this->view->ui_theme = $cnf->object()->theme; } + $product_vars = json_decode(file_get_contents('/usr/local/opnsense/firmware-product'), true); + foreach ($product_vars as $product_key => $product_var) { + $this->view->$product_key = $product_var; + } + // info about the current user and box $this->view->session_username = !empty($_SESSION['Username']) ? $_SESSION['Username'] : '(unknown)'; $this->view->system_hostname = $cnf->object()->system->hostname; diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt index 8488fc2f7..910228cbf 100644 --- a/src/opnsense/mvc/app/views/layouts/default.volt +++ b/src/opnsense/mvc/app/views/layouts/default.volt @@ -250,7 +250,9 @@