From 7d37df016f62e22c83a3a562302af72d398a064d Mon Sep 17 00:00:00 2001
From: phl0 <github@florian-wolters.de>
Date: Wed, 30 Aug 2023 12:53:49 +0200
Subject: [PATCH] Handle initial case when user options are empty

---
 application/controllers/Logbookadvanced.php | 12 +++++++++---
 application/views/logbookadvanced/index.php |  7 ++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php
index b381aef4..9fc9f54e 100644
--- a/application/controllers/Logbookadvanced.php
+++ b/application/controllers/Logbookadvanced.php
@@ -42,7 +42,9 @@ class Logbookadvanced extends CI_Controller {
 		$data['hasDatePicker'] = true;
 
 		$userOptions = $this->user_options_model->get_options('LogbookAdvanced')->result();
-		$data['options'] = $userOptions[0]->option_value;
+		if (isset($userOptions[0])) {
+			$data['options'] = $userOptions[0]->option_value;
+		}
 
 		$pageData = [];
 		$pageData['datePlaceholder'] = 'DD/MM/YYYY';
@@ -412,8 +414,12 @@ class Logbookadvanced extends CI_Controller {
 	public function userOptions() {
 		$this->load->model('user_options_model');
 		$userOptions = $this->user_options_model->get_options('LogbookAdvanced')->result();
-		$data['options'] = $options = json_decode($userOptions[0]->option_value);
-        $this->load->view('logbookadvanced/useroptions', $data);
+		if (isset($userOptions[0])) {
+			$data['options'] = $options = json_decode($userOptions[0]->option_value);
+		} else {
+			$data['options'] = null;
+		}
+		$this->load->view('logbookadvanced/useroptions', $data);
 	}
 
 	public function setUserOptions() {
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index c2ffd493..0002bd80 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -5,7 +5,12 @@
  *
  */
 var custom_date_format = "<?php echo $custom_date_format ?>";
-<?php echo "var user_options = $options;"; ?>
+<?php
+if (!isset($options)) {
+   $options = "{\"datetime\":{\"show\":\"true\"},\"de\":{\"show\":\"true\"},\"dx\":{\"show\":\"true\"},\"mode\":{\"show\":\"true\"},\"rstr\":{\"show\":\"true\"},\"rsts\":{\"show\":\"true\"},\"band\":{\"show\":\"true\"},\"myrefs\":{\"show\":\"true\"},\"refs\":{\"show\":\"true\"},\"name\":{\"show\":\"true\"},\"qslvia\":{\"show\":\"true\"},\"qsl\":{\"show\":\"true\"},\"lotw\":{\"show\":\"true\"},\"eqsl\":{\"show\":\"true\"},\"qslmsg\":{\"show\":\"true\"},\"dxcc\":{\"show\":\"true\"},\"state\":{\"show\":\"true\"},\"cqzone\":{\"show\":\"true\"},\"iota\":{\"show\":\"true\"}}";
+}
+echo "var user_options = $options;";
+?>
 </script>
 <style>
 /*Legend specific*/