From 1b6441064934d02d1756e20501401cf8fb39d934 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <peter@magicbug.co.uk>
Date: Wed, 16 Feb 2022 22:59:59 +0000
Subject: [PATCH] Check if the config items already in session before running a
 database query

---
 application/libraries/OptionsLib.php          | 37 +++++++++++++++----
 application/views/interface_assets/footer.php | 16 ++++----
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/application/libraries/OptionsLib.php b/application/libraries/OptionsLib.php
index baf9f45e..40040926 100644
--- a/application/libraries/OptionsLib.php
+++ b/application/libraries/OptionsLib.php
@@ -46,14 +46,37 @@ class OptionsLib {
         // Make Codeigniter functions available to library
         $CI =& get_instance();
 
-        //Load the options model
-        $CI->load->model('options_model');
-        
-        // call library function to get options value
-        $options_result = $CI->options_model->item($option_name);
+        if (strpos($option_name, 'option_')) { 
+            if(!$CI->config->item('option_'.$option_name)) {
+                //Load the options model
+                $CI->load->model('options_model');
+                
+                // call library function to get options value
+                $options_result = $CI->options_model->item($option_name);
+    
+                // return option_value as a string
+                return $options_result;
+            } else {
+                return $CI->config->item($option_name);
+            }
+        } else {
+
+                return $CI->config->item($option_name);
+        }
+
+        if(!$CI->config->item('option_'.$option_name)) {
+            //Load the options model
+            $CI->load->model('options_model');
+            
+            // call library function to get options value
+            $options_result = $CI->options_model->item($option_name);
+
+            // return option_value as a string
+            return $options_result;
+        } else {
+            return $CI->config->item($option_name);
+        }
 
-        // return option_value as a string
-        return $options_result;
     }
 
     // Function to save new option to options table
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index d1404a78..72cd9a44 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -834,9 +834,9 @@ $(document).on('keypress',function(e) {
   })
   <?php } ?>
 
-  L.tileLayer('<?php echo $this->optionslib->get_option('map_tile_server');?>', {
+  L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server');?>', {
     maxZoom: 18,
-    attribution: '<?php echo $this->optionslib->get_option('map_tile_server_copyright');?>',
+    attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
     id: 'mapbox.streets'
   }).addTo(mymap);
 
@@ -1128,9 +1128,9 @@ $(document).on('keypress',function(e) {
 
   var mymap = L.map('map').setView([lat,long], 5);
 
-  L.tileLayer('<?php echo $this->optionslib->get_option('map_tile_server');?>', {
+  L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server');?>', {
     maxZoom: 18,
-    attribution: '<?php echo $this->optionslib->get_option('map_tile_server_copyright');?>',
+    attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
     id: 'mapbox.streets'
   }).addTo(mymap);
 
@@ -1187,9 +1187,9 @@ $(document).ready(function(){
 
 <script>
 
-  var layer = L.tileLayer('<?php echo $this->optionslib->get_option('map_tile_server');?>', {
+  var layer = L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server');?>', {
     maxZoom: 18,
-    attribution: '<?php echo $this->optionslib->get_option('map_tile_server_copyright');?>',
+    attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
     id: 'mapbox.streets'
   });
 
@@ -1354,9 +1354,9 @@ $(document).ready(function(){
 							var callsign = $("#callsign").text();
 							var mymap = L.map('mapqso').setView([lat,long], 5);
 
-							var tiles = L.tileLayer('<?php echo $this->optionslib->get_option('map_tile_server');?>', {
+							var tiles = L.tileLayer('<?php echo $this->optionslib->get_option('option_map_tile_server');?>', {
 								maxZoom: 18,
-								attribution: '<?php echo $this->optionslib->get_option('map_tile_server_copyright');?>',
+								attribution: '<?php echo $this->optionslib->get_option('option_map_tile_server_copyright');?>',
 							}).addTo(mymap);