mirrors/Cloudlog
1
0
Fork 0
mirror of https://github.com/magicbug/Cloudlog synced 2024-11-23 18:24:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Options] Fixes shoddy get_option() function

Browse Source
This commit is contained in:
Peter Goodhall 2022-03-25 16:14:51 +00:00
parent 985e71638d
commit eaf814b336
3 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Options.php
View File

@ -75,7 +75,7 @@ class Options extends CI_Controller {
else
{
// Update theme choice within the options system
$theme_update_status = $this->optionslib->update('theme', $this->input->post('theme'));
$theme_update_status = $this->optionslib->update('theme', $this->input->post('theme'), 'yes');
// If theme update is complete set a flashsession with a success note
if($theme_update_status == TRUE) {

38
application/libraries/OptionsLib.php
View File

@ -45,38 +45,32 @@ class OptionsLib {
function get_option($option_name) {
// Make Codeigniter functions available to library
$CI =& get_instance();
if (strpos($option_name, 'option_')) {
if(!$CI->config->item('option_'.$option_name)) {
//Load the options model
if (strpos($option_name, 'option_') !== false) {
if(!$CI->config->item($option_name)) {
//Load the options model
$CI->load->model('options_model');
$removed_options_tag = trim($option_name, 'option_');
// call library function to get options value
$options_result = $CI->options_model->item($option_name);
$options_result = $CI->options_model->item($removed_options_tag);
// return option_value as a string
return $options_result;
} else {
return $CI->config->item($option_name);
}
} else {
if(!$CI->config->item($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);
}
}
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);
}
}
// Function to save new option to options table

2
application/views/options/appearance.php
View File

@ -50,7 +50,7 @@
<?php
foreach ($themes as $theme) {
echo '<option value="' . $theme->foldername . '"';
if ($this->optionslib->get_option('theme') == $theme->foldername) {
if ($this->optionslib->get_option('option_theme') == $theme->foldername) {
echo 'selected="selected"';
}
echo '>' . $theme->name . '</option>';