From b73c0e7db6ce4f952dc21b6c7ca86298efc2f953 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 9 Jul 2017 12:43:26 +0200
Subject: [PATCH] firmware: major upgrade button for #1707

---
 plist                                                  |  1 +
 src/opnsense/firmware-message                          |  1 +
 .../OPNsense/Core/Api/FirmwareController.php           | 10 ++++++----
 src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt | 10 ++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 src/opnsense/firmware-message

diff --git a/plist b/plist
index a6d0a2549..f478e5ef8 100644
--- a/plist
+++ b/plist
@@ -313,6 +313,7 @@
 /usr/local/opnsense/contrib/simplepie/library/SimplePie/gzdecode.php
 /usr/local/opnsense/contrib/simplepie/phpunit.xml.dist
 /usr/local/opnsense/contrib/tzdata/iso3166.tab
+/usr/local/opnsense/firmware-message
 /usr/local/opnsense/firmware-product
 /usr/local/opnsense/firmware-upgrade
 /usr/local/opnsense/mvc/app/cache/README
diff --git a/src/opnsense/firmware-message b/src/opnsense/firmware-message
new file mode 100644
index 000000000..21187a14b
--- /dev/null
+++ b/src/opnsense/firmware-message
@@ -0,0 +1 @@
+A placeholder for the 17.7 upgrade message.
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
index b10d30df1..f3c787a0d 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Core/Api/FirmwareController.php
@@ -266,12 +266,14 @@ class FirmwareController extends ApiControllerBase
     {
         $backend = new Backend();
         $response = array();
-        if ($this->request->hasPost("upgrade")) {
+        if ($this->request->hasPost('upgrade')) {
             $response['status'] = 'ok';
-            if ($this->request->getPost("upgrade") == "pkg") {
-                $action = "firmware upgrade pkg";
+            if ($this->request->getPost('upgrade') == 'pkg') {
+                $action = 'firmware upgrade pkg';
+            } elseif ($this->request->getPost('upgrade') == 'maj') {
+                $action = 'firmware upgrade maj';
             } else {
-                $action = "firmware upgrade all";
+                $action = 'firmware upgrade all';
             }
             $response['msg_uuid'] = trim($backend->configdRun($action, true));
         } else {
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index 4b5a441c5..2bee79ff8 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -478,6 +478,16 @@ POSSIBILITY OF SUCH DAMAGE.
                 title: "{{ lang._('End-of-Life Notice') }}",
                 message: $('#message').html(),
                 buttons: [{
+<?php if (file_exists('/usr/local/opnsense/firmware-upgrade')): ?>
+                    label: "{{ lang._('Upgrade') }}",
+                    action: function(dialogRef){
+                        dialogRef.close();
+                        $.upgrade_needs_reboot = 1;
+                        $.upgrade_action = 'maj';
+                        upgrade_ui();
+                    }
+                },{
+<?php endif ?>
                     label: "{{ lang._('Close') }}",
                     action: function(dialogRef){
                         dialogRef.close();