diff --git a/application/controllers/Contestcalendar.php b/application/controllers/Contestcalendar.php index ac8eda27e..e61a67f45 100644 --- a/application/controllers/Contestcalendar.php +++ b/application/controllers/Contestcalendar.php @@ -12,7 +12,7 @@ class Contestcalendar extends CI_Controller { $rssUrl = 'https://www.contestcalendar.com/calendar.rss'; if (!$rssRawData = $this->cache->get('RssRawContestCal')) { $rssRawData = file_get_contents($rssUrl, true); - $this->cache->save('RssRawContestCal', $rssRawData, (60*12)); + $this->cache->save('RssRawContestCal', $rssRawData, (60*60*12)); } $data['rss'] = simplexml_load_string($rssRawData, null, LIBXML_NOCDATA); diff --git a/application/controllers/Dxcalendar.php b/application/controllers/Dxcalendar.php index 9bfc720ae..36890882d 100644 --- a/application/controllers/Dxcalendar.php +++ b/application/controllers/Dxcalendar.php @@ -13,7 +13,7 @@ class Dxcalendar extends CI_Controller { $rssUrl = 'http://www.ng3k.com/adxo.xml'; if (!$rssRawData = $this->cache->get('RssRawDxCal')) { $rssRawData = file_get_contents($rssUrl, true); - $this->cache->save('RssRawDxCal', $rssRawData, (60*12)); + $this->cache->save('RssRawDxCal', $rssRawData, (60*60*12)); } $rssdata = simplexml_load_string($rssRawData, null, LIBXML_NOCDATA); diff --git a/application/controllers/Sattimers.php b/application/controllers/Sattimers.php index bdcfdcfd7..48dd2b5d1 100644 --- a/application/controllers/Sattimers.php +++ b/application/controllers/Sattimers.php @@ -9,41 +9,50 @@ class Sattimers extends CI_Controller { if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } } - public function index() { - $this->load->model('stations'); - $footerData = []; - $footerData['scripts'] = [ - 'assets/js/sections/sattimers.js?' - ]; - $url = 'https://www.df2et.de/tevel/api2.php?grid='.strtoupper($this->stations->find_gridsquare()); - $json = file_get_contents($url); - $data['activations'] = json_decode($json, true)['data']; - $data['gridsquare'] = strtoupper($this->stations->find_gridsquare()); + public function index() { + $this->load->model('stations'); + $footerData = []; + $footerData['scripts'] = [ + 'assets/js/sections/sattimers.js?' + ]; - $data['page_title'] = "Satellite Timers"; + $url = 'https://www.df2et.de/tevel/api2.php?grid='.strtoupper($this->stations->find_gridsquare()); - $CI =& get_instance(); - if($CI->session->userdata('user_date_format')) { - $data['custom_date_format'] = $CI->session->userdata('user_date_format'); - } else { - $data['custom_date_format'] = $CI->config->item('qso_date_format'); - } + $this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file')); + if (!$RawData = $this->cache->get('SatTimers'.strtoupper($this->stations->find_gridsquare()))) { + $RawData = file_get_contents($url, true); + $this->cache->save('SatTimers'.strtoupper($this->stations->find_gridsquare()), $RawData, (60*10)); + } - switch ($data['custom_date_format']) { - case "d/m/y": $data['custom_date_format'] = 'DD/MM/YY'; break; - case "d/m/Y": $data['custom_date_format'] = 'DD/MM/YYYY'; break; - case "m/d/y": $data['custom_date_format'] = 'MM/DD/YY'; break; - case "m/d/Y": $data['custom_date_format'] = 'MM/DD/YYYY'; break; - case "d.m.Y": $data['custom_date_format'] = 'DD.MM.YYYY'; break; - case "y/m/d": $data['custom_date_format'] = 'YY/MM/DD'; break; - case "Y-m-d": $data['custom_date_format'] = 'YYYY-MM-DD'; break; - case "M d, Y": $data['custom_date_format'] = 'MMM DD, YYYY'; break; - case "M d, y": $data['custom_date_format'] = 'MMM DD, YY'; break; - default: $data['custom_date_format'] = 'DD/MM/YYYY'; - } + $json = $RawData; - $this->load->view('interface_assets/header', $data); - $this->load->view('/sattimers/index', $data); - $this->load->view('interface_assets/footer', $footerData); - } + $data['activations'] = json_decode($json, true)['data']; + $data['gridsquare'] = strtoupper($this->stations->find_gridsquare()); + + $data['page_title'] = "Satellite Timers"; + + $CI =& get_instance(); + if($CI->session->userdata('user_date_format')) { + $data['custom_date_format'] = $CI->session->userdata('user_date_format'); + } else { + $data['custom_date_format'] = $CI->config->item('qso_date_format'); + } + + switch ($data['custom_date_format']) { + case "d/m/y": $data['custom_date_format'] = 'DD/MM/YY'; break; + case "d/m/Y": $data['custom_date_format'] = 'DD/MM/YYYY'; break; + case "m/d/y": $data['custom_date_format'] = 'MM/DD/YY'; break; + case "m/d/Y": $data['custom_date_format'] = 'MM/DD/YYYY'; break; + case "d.m.Y": $data['custom_date_format'] = 'DD.MM.YYYY'; break; + case "y/m/d": $data['custom_date_format'] = 'YY/MM/DD'; break; + case "Y-m-d": $data['custom_date_format'] = 'YYYY-MM-DD'; break; + case "M d, Y": $data['custom_date_format'] = 'MMM DD, YYYY'; break; + case "M d, y": $data['custom_date_format'] = 'MMM DD, YY'; break; + default: $data['custom_date_format'] = 'DD/MM/YYYY'; + } + + $this->load->view('interface_assets/header', $data); + $this->load->view('/sattimers/index', $data); + $this->load->view('interface_assets/footer', $footerData); + } }