From 1498f74072e0132e9c4b309edc5f1a17c6394e41 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Mon, 7 Aug 2023 10:47:03 +0100 Subject: [PATCH] [Clublog] If downloading exceptions fails from the clublog cdn try the cloudlog backup --- application/controllers/Update.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/application/controllers/Update.php b/application/controllers/Update.php index cd56804c..deb74779 100644 --- a/application/controllers/Update.php +++ b/application/controllers/Update.php @@ -178,8 +178,18 @@ class Update extends CI_Controller { $gz = gzopen($url, 'r'); if ($gz === FALSE) { - $this->update_status("Something went wrong with fetching the cty.xml file."); - return; + // If the download from clublog.org fails, try cloudlog.org CDN. + $url = "https://cdn.cloudlog.org/clublogxml.gz"; + $gz = gzopen($url, 'r'); + + // Log failure to log file + log_message('info', 'Failed to download cty.xml from clublog.org, trying cloudlog.org CDN'); + + if ($gz === FALSE) { + $this->update_status("FAILED: Could not download from clublog.org or cloudlog.org"); + log_message('error', 'FAILED: Could not download exceptions from clublog.org or cloudlog.org'); + return; + } } $data = "";