Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Timeout and warning if contestcal isn't reachable

Browse Source
This commit is contained in:
int2001
2024-10-23 05:00:30 +00:00
parent c5546c863b
commit 3e8be711b6
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
application/controllers/Contestcalendar.php
View File

@@ -20,24 +20,32 @@ class Contestcalendar extends CI_Controller {
// get the raw data and parse it
$rssRawData = $this->getRssData();
$parsed = $this->parseRSS($rssRawData);
if ($rssRawData !== false) {
$parsed = $this->parseRSS($rssRawData);
// and give it to the view
$data['contestsToday'] = $this->contestsToday($parsed);
$data['contestsNextWeekend'] = $this->contestsNextWeekend($parsed);
$data['contestsNextWeek'] = $this->contestsNextWeek($parsed);
// and give it to the view
$data['contestsToday'] = $this->contestsToday($parsed);
$data['contestsNextWeekend'] = $this->contestsNextWeekend($parsed);
$data['contestsNextWeek'] = $this->contestsNextWeek($parsed);
// Get Date format
if ($this->session->userdata('user_date_format')) {
$data['custom_date_format'] = $this->session->userdata('user_date_format');
// Get Date format
if ($this->session->userdata('user_date_format')) {
$data['custom_date_format'] = $this->session->userdata('user_date_format');
} else {
$data['custom_date_format'] = $this->config->item('qso_date_format');
}
$footerData['scripts'] = [
'assets/js/sections/dxcalendar.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/dxcalendar.js"))
];
} else {
$data['custom_date_format'] = $this->config->item('qso_date_format');
$data['contestsToday']='';
$data['contestsNextWeekend']='';
$data['contestsNextWeek']='';
$data['custom_date_format'] = '';
$footerData['scripts']=[];
$this->session->set_flashdata('error', __("Contestcalendar not reachable. Try again later"));
}
$footerData['scripts'] = [
'assets/js/sections/dxcalendar.js?' . filemtime(realpath(__DIR__ . "/../../assets/js/sections/dxcalendar.js"))
];
$this->load->view('interface_assets/header', $data);
$this->load->view('contestcalendar/index');
$this->load->view('interface_assets/footer', $footerData);
@@ -129,13 +137,12 @@ class Contestcalendar extends CI_Controller {
curl_setopt($ch, CURLOPT_HEADER, false);
curl_setopt($ch, CURLOPT_USERAGENT, 'Wavelog Updater');
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
$rssRawData = curl_exec($ch);
curl_close($ch);
if ($rssRawData === FALSE) {
$msg = "Something went wrong with fetching the Contest Data";
log_message('error', $msg);
return;
return false;
}
$this->cache->save('RssRawContestCal', $rssRawData, (60 * 60 * 12)); // 12 hours cache time