From 28b6dff793428b1d0732f658cf2940eb01b24f08 Mon Sep 17 00:00:00 2001
From: Fabian Franz <franz.fabian.94@gmail.com>
Date: Sat, 2 Dec 2017 18:35:25 +0100
Subject: [PATCH 1/4] fix the localStorage issue from #1915

---
 src/opnsense/www/js/opnsense_ui.js | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js
index 9824f5865..d1e133e28 100644
--- a/src/opnsense/www/js/opnsense_ui.js
+++ b/src/opnsense/www/js/opnsense_ui.js
@@ -228,6 +228,15 @@ function addMultiSelectClearUI() {
     });
 }
 
+function checkSessionStorageExists() {
+  if ('sessionStorage' in window) {
+    if (window.sessionStorage != null) {
+      return true;
+    }
+  }
+  return false;
+}
+
 /**
  * setup form help buttons
  */
@@ -243,17 +252,21 @@ function initFormHelpUI() {
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
         if ($('[id*="show_all_help"]').hasClass("fa-toggle-on")) {
-            sessionStorage.setItem('all_help_preset', 1);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('all_help_preset', 1);
+            }
             $('[for*="help_for"]').addClass("show");
             $('[for*="help_for"]').removeClass("hidden");
         } else {
             $('[for*="help_for"]').addClass("hidden");
             $('[for*="help_for"]').removeClass("show");
-            sessionStorage.setItem('all_help_preset', 0);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('all_help_preset', 0);
+            }
         }
         event.preventDefault();
     });
-    if (sessionStorage.getItem('all_help_preset') == 1) {
+    if (checkSessionStorageExists() && sessionStorage.getItem('all_help_preset') == 1) {
         // show all help messages when preset was stored
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
@@ -266,7 +279,7 @@ function initFormHelpUI() {
  * handle advanced show/hide
  */
 function initFormAdvancedUI() {
-    if (sessionStorage.getItem('show_advanced_preset') == 1) {
+    if (checkSessionStorageExists() && sessionStorage.getItem('show_advanced_preset') == 1) {
         // show advanced options when preset was stored
         $('[id*="show_advanced"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_advanced"]').toggleClass("text-success text-danger");
@@ -282,10 +295,14 @@ function initFormAdvancedUI() {
         if ($('[id*="show_advanced"]').hasClass("fa-toggle-on")) {
             $('[data-advanced*="true"]').show();
             $('[data-advanced*="hidden_row"]').remove(); // the table row is deleted to keep correct table striping
-            sessionStorage.setItem('show_advanced_preset', 1);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('show_advanced_preset', 1);
+            }
         } else {
             $('[data-advanced*="true"]').after("<tr data-advanced='hidden_row'></tr>").hide(); // the table row is added to keep correct table striping
-            sessionStorage.setItem('show_advanced_preset', 0);
+            if (checkSessionStorageExists()) {
+                sessionStorage.setItem('show_advanced_preset', 0);
+            }
         }
     });
 }

From b2f0465cecf4b40cdad4e31615832dd86081099a Mon Sep 17 00:00:00 2001
From: Fabian Franz <franz.fabian.94@gmail.com>
Date: Sat, 2 Dec 2017 19:21:14 +0100
Subject: [PATCH 2/4] add the fix to the other files too

---
 src/opnsense/www/js/opnsense.js    | 45 ++++++++++++++++++++----------
 src/opnsense/www/js/opnsense_ui.js |  8 ------
 src/www/head.inc                   | 10 +++++--
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/src/opnsense/www/js/opnsense.js b/src/opnsense/www/js/opnsense.js
index f5254e9ec..7e76342a8 100644
--- a/src/opnsense/www/js/opnsense.js
+++ b/src/opnsense/www/js/opnsense.js
@@ -36,9 +36,24 @@
   * @param value encoded text
   * @return string decoded text
   */
- function htmlDecode(value) {
-     return $("<textarea/>").html(value).text();
- }
+function htmlDecode(value) {
+    return $("<textarea/>").html(value).text();
+}
+ 
+
+/**
+ * Check if sessionStorage is available
+ * 
+ * @return boolean if sessionStorage is available.
+ */
+function checkSessionStorageExists() {
+  if ('sessionStorage' in window) {
+    if (window.sessionStorage != null) {
+      return true;
+    }
+  }
+  return false;
+}
 
  /**
  *
@@ -240,17 +255,19 @@ function watchScrollPosition() {
     }
 
     // link on scroll event handler
-    $(window).scroll(function(){
-        sessionStorage.setItem('scrollpos', current_location()+"|"+$(window).scrollTop());
-    });
+    if (checkSessionStorageExists()) {
+        $(window).scroll(function(){
+            sessionStorage.setItem('scrollpos', current_location()+"|"+$(window).scrollTop());
+        });
 
-    // move to last known position on page load
-    $( document ).ready(function() {
-        var scrollpos = sessionStorage.getItem('scrollpos');
-        if (scrollpos != null) {
-            if (scrollpos.split('|')[0] == current_location()) {
-                $(window).scrollTop(scrollpos.split('|')[1]);
+        // move to last known position on page load
+        $( document ).ready(function() {
+            var scrollpos = sessionStorage.getItem('scrollpos');
+            if (scrollpos != null) {
+                if (scrollpos.split('|')[0] == current_location()) {
+                    $(window).scrollTop(scrollpos.split('|')[1]);
+                }
             }
-        }
-    });
+        });
+    }
 }
diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js
index d1e133e28..34a8868b3 100644
--- a/src/opnsense/www/js/opnsense_ui.js
+++ b/src/opnsense/www/js/opnsense_ui.js
@@ -228,14 +228,6 @@ function addMultiSelectClearUI() {
     });
 }
 
-function checkSessionStorageExists() {
-  if ('sessionStorage' in window) {
-    if (window.sessionStorage != null) {
-      return true;
-    }
-  }
-  return false;
-}
 
 /**
  * setup form help buttons
diff --git a/src/www/head.inc b/src/www/head.inc
index e460effd0..0707aeda2 100644
--- a/src/www/head.inc
+++ b/src/www/head.inc
@@ -151,17 +151,21 @@ $pagetitle .= html_safe(sprintf(' | %s.%s', $config['system']['hostname'], $conf
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
         if ($('[id*="show_all_help"]').hasClass("fa-toggle-on")) {
-          sessionStorage.setItem('all_help_preset', 1);
+          if (checkSessionStorageExists()) {
+            sessionStorage.setItem('all_help_preset', 1);
+          }
           $('[for*="help_for"]').addClass("show");
           $('[for*="help_for"]').removeClass("hidden");
         } else {
-          sessionStorage.setItem('all_help_preset', 0);
+          if (checkSessionStorageExists()) {
+            sessionStorage.setItem('all_help_preset', 0);
+          }
           $('[for*="help_for"]').addClass("hidden");
           $('[for*="help_for"]').removeClass("show");
         }
         event.preventDefault();
       });
-      if (sessionStorage.getItem('all_help_preset') == 1) {
+      if (checkSessionStorageExists() && sessionStorage.getItem('all_help_preset') == 1) {
           // show all help messages when preset was stored
           $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
           $('[id*="show_all_help"]').toggleClass("text-success text-danger");

From 062bdb294d7763ad215568d24f2a4fc15c73b110 Mon Sep 17 00:00:00 2001
From: Fabian Franz <franz.fabian.94@gmail.com>
Date: Sat, 2 Dec 2017 19:32:47 +0100
Subject: [PATCH 3/4] remove function for checking for sessionStorage

---
 src/opnsense/www/js/opnsense.js    | 16 +---------------
 src/opnsense/www/js/opnsense_ui.js | 12 ++++++------
 src/www/head.inc                   |  4 ++--
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/opnsense/www/js/opnsense.js b/src/opnsense/www/js/opnsense.js
index 7e76342a8..22fa17c00 100644
--- a/src/opnsense/www/js/opnsense.js
+++ b/src/opnsense/www/js/opnsense.js
@@ -39,21 +39,7 @@
 function htmlDecode(value) {
     return $("<textarea/>").html(value).text();
 }
- 
 
-/**
- * Check if sessionStorage is available
- * 
- * @return boolean if sessionStorage is available.
- */
-function checkSessionStorageExists() {
-  if ('sessionStorage' in window) {
-    if (window.sessionStorage != null) {
-      return true;
-    }
-  }
-  return false;
-}
 
  /**
  *
@@ -255,7 +241,7 @@ function watchScrollPosition() {
     }
 
     // link on scroll event handler
-    if (checkSessionStorageExists()) {
+    if (window.sessionStorage) {
         $(window).scroll(function(){
             sessionStorage.setItem('scrollpos', current_location()+"|"+$(window).scrollTop());
         });
diff --git a/src/opnsense/www/js/opnsense_ui.js b/src/opnsense/www/js/opnsense_ui.js
index 34a8868b3..a51093d03 100644
--- a/src/opnsense/www/js/opnsense_ui.js
+++ b/src/opnsense/www/js/opnsense_ui.js
@@ -244,7 +244,7 @@ function initFormHelpUI() {
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
         if ($('[id*="show_all_help"]').hasClass("fa-toggle-on")) {
-            if (checkSessionStorageExists()) {
+            if (window.sessionStorage) {
                 sessionStorage.setItem('all_help_preset', 1);
             }
             $('[for*="help_for"]').addClass("show");
@@ -252,13 +252,13 @@ function initFormHelpUI() {
         } else {
             $('[for*="help_for"]').addClass("hidden");
             $('[for*="help_for"]').removeClass("show");
-            if (checkSessionStorageExists()) {
+            if (window.sessionStorage) {
                 sessionStorage.setItem('all_help_preset', 0);
             }
         }
         event.preventDefault();
     });
-    if (checkSessionStorageExists() && sessionStorage.getItem('all_help_preset') == 1) {
+    if (window.sessionStorage && sessionStorage.getItem('all_help_preset') == 1) {
         // show all help messages when preset was stored
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
@@ -271,7 +271,7 @@ function initFormHelpUI() {
  * handle advanced show/hide
  */
 function initFormAdvancedUI() {
-    if (checkSessionStorageExists() && sessionStorage.getItem('show_advanced_preset') == 1) {
+    if (window.sessionStorage && sessionStorage.getItem('show_advanced_preset') == 1) {
         // show advanced options when preset was stored
         $('[id*="show_advanced"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_advanced"]').toggleClass("text-success text-danger");
@@ -287,12 +287,12 @@ function initFormAdvancedUI() {
         if ($('[id*="show_advanced"]').hasClass("fa-toggle-on")) {
             $('[data-advanced*="true"]').show();
             $('[data-advanced*="hidden_row"]').remove(); // the table row is deleted to keep correct table striping
-            if (checkSessionStorageExists()) {
+            if (window.sessionStorage) {
                 sessionStorage.setItem('show_advanced_preset', 1);
             }
         } else {
             $('[data-advanced*="true"]').after("<tr data-advanced='hidden_row'></tr>").hide(); // the table row is added to keep correct table striping
-            if (checkSessionStorageExists()) {
+            if (window.sessionStorage) {
                 sessionStorage.setItem('show_advanced_preset', 0);
             }
         }
diff --git a/src/www/head.inc b/src/www/head.inc
index 0707aeda2..63fec39cc 100644
--- a/src/www/head.inc
+++ b/src/www/head.inc
@@ -151,13 +151,13 @@ $pagetitle .= html_safe(sprintf(' | %s.%s', $config['system']['hostname'], $conf
         $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
         $('[id*="show_all_help"]').toggleClass("text-success text-danger");
         if ($('[id*="show_all_help"]').hasClass("fa-toggle-on")) {
-          if (checkSessionStorageExists()) {
+          if (window.sessionStorage) {
             sessionStorage.setItem('all_help_preset', 1);
           }
           $('[for*="help_for"]').addClass("show");
           $('[for*="help_for"]').removeClass("hidden");
         } else {
-          if (checkSessionStorageExists()) {
+          if (window.sessionStorage) {
             sessionStorage.setItem('all_help_preset', 0);
           }
           $('[for*="help_for"]').addClass("hidden");

From 497d5fe0a4e9c478fb99f8d4d1eeab17c6d05a5b Mon Sep 17 00:00:00 2001
From: Fabian Franz <franz.fabian.94@gmail.com>
Date: Sat, 2 Dec 2017 19:35:28 +0100
Subject: [PATCH 4/4] remove function for checking for sessionStorage

---
 src/www/head.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/www/head.inc b/src/www/head.inc
index 63fec39cc..8996a6f88 100644
--- a/src/www/head.inc
+++ b/src/www/head.inc
@@ -165,7 +165,7 @@ $pagetitle .= html_safe(sprintf(' | %s.%s', $config['system']['hostname'], $conf
         }
         event.preventDefault();
       });
-      if (checkSessionStorageExists() && sessionStorage.getItem('all_help_preset') == 1) {
+      if (window.sessionStorage && sessionStorage.getItem('all_help_preset') == 1) {
           // show all help messages when preset was stored
           $('[id*="show_all_help"]').toggleClass("fa-toggle-on fa-toggle-off");
           $('[id*="show_all_help"]').toggleClass("text-success text-danger");