goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Check if the config items already in session before running a database query

浏览代码
这个提交包含在：
Peter Goodhall 2022-02-16 22:59:59 +00:00
父节点 91548afea7
当前提交 1b64410649
共有 2 个文件被更改，包括 38 次插入 和 15 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

37
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

16
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);