diff --git a/README.md b/README.md index defb6c53f..1a0f707e8 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Special thanks to our contributors, who are part of Wavelog by improving code! Translators: -[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/) +[Ondřej Koloničný (OK1CDJ)](https://translate.wavelog.org/user/ok1cdj/), [Michael Skolsky (R1BLH)](https://translate.wavelog.org/user/R1BLH/), [Karuru (BG2ELG)](https://translate.wavelog.org/user/viola/), [Byt3](https://translate.wavelog.org/user/205er/), [BG6HJE](https://translate.wavelog.org/user/BG6HJE/), [Francisco (F4VSE)](https://translate.wavelog.org/user/kikosgc/), [Kim (DG9VH)](https://translate.wavelog.org/user/dg9vh/), [Casper van Lieburg (PA7DX)](https://translate.wavelog.org/user/pa7dx/), [Halil AYYILDIZ (TA2LG)](https://translate.wavelog.org/user/TA2LG/), [Michal Šiman](https://translate.wavelog.org/user/michalsiman/), [DN4BS](https://github.com/dn4bs), [Luca (IU2FRL)](https://translate.wavelog.org/user/iu2frl/), [Dragan Đorđević (4O4A)](https://translate.wavelog.org/user/4o4a/), [Dren Imeraj (Z63DRI)](https://translate.wavelog.org/user/Dren/), [Filip Melik (OK1GOD)](https://translate.wavelog.org/user/filipmelik/), [Petr (OK1PTR)](https://translate.wavelog.org/user/OK1PTR/) If you would like to contribute in any way to Wavelog, it is most appreciated. This has been developed in free time, help coding new features or writing documentation is always useful. diff --git a/application/controllers/Cron.php b/application/controllers/Cron.php index 609d8fcc6..c25735eb8 100644 --- a/application/controllers/Cron.php +++ b/application/controllers/Cron.php @@ -75,6 +75,7 @@ class cron extends CI_Controller { $cronjob = $this->cronexpression; $dt = new DateTime(); $isdue = $cronjob->isMatching($dt); + $set_status = true; $next_run = $cronjob->getNext(); $next_run_date = date('Y-m-d H:i:s', $next_run); @@ -115,6 +116,7 @@ class cron extends CI_Controller { $isdue_result = 'false'; echo "CRON: " . $cron->id . " -> is due: " . $isdue_result . " -> Next Run: " . $next_run_date . "\n"; $status = 'healthy'; + $set_status = false; } } else { echo 'CRON: ' . $cron->id . " is disabled. skipped..\n"; @@ -123,7 +125,9 @@ class cron extends CI_Controller { // Set the next_run timestamp to null to indicate in the view/database that this cron is disabled $this->cron_model->set_next_run($cron->id, null); } - $this->cron_model->set_status($cron->id, $status); + if ($set_status == true) { + $this->cron_model->set_status($cron->id, $status); + } $this->cronexpression = null; } diff --git a/application/controllers/Eqsl.php b/application/controllers/Eqsl.php index b6b8d2d60..98eae0ac3 100644 --- a/application/controllers/Eqsl.php +++ b/application/controllers/Eqsl.php @@ -318,7 +318,12 @@ class eqsl extends CI_Controller { $images = $dom->getElementsByTagName('img'); if (!isset($images) || count($images) == 0) { - echo "Rate Limited"; + $h3 = $dom->getElementsByTagName('h3'); + if (isset($h3)) { + echo $h3->item(0)->nodeValue; + } else { + echo "Rate Limited"; + } exit; } @@ -348,7 +353,6 @@ class eqsl extends CI_Controller { $this->session->set_flashdata('error', __("You're not allowed to do that!")); redirect('dashboard'); } - $this->load->library('electronicqsl'); $this->load->model('Eqsl_images'); $this->load->model('logbook_model'); @@ -384,7 +388,12 @@ class eqsl extends CI_Controller { $images = $dom->getElementsByTagName('img'); if (!isset($images) || count($images) == 0) { - $error = "Rate Limited"; + $h3 = $dom->getElementsByTagName('h3'); + if (isset($h3)) { + $error = $h3->item(0)->nodeValue; + } else { + $error = "Rate Limited"; + } return $error; } @@ -402,7 +411,6 @@ class eqsl extends CI_Controller { } } } - return $error; } public function tools() { @@ -429,6 +437,7 @@ class eqsl extends CI_Controller { redirect('dashboard'); } $errors = 0; + $this->load->library('electronicqsl'); if ($this->input->post('eqsldownload') == 'download') { $i = 0; diff --git a/application/locale/bg_BG/LC_MESSAGES/messages.po b/application/locale/bg_BG/LC_MESSAGES/messages.po index 83653ef33..75cb1fff5 100644 --- a/application/locale/bg_BG/LC_MESSAGES/messages.po +++ b/application/locale/bg_BG/LC_MESSAGES/messages.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: translations@wavelog.org\n" -"POT-Creation-Date: 2024-08-26 13:16+0000\n" +"POT-Creation-Date: 2024-08-26 17:05+0000\n" "PO-Revision-Date: 2024-08-17 10:46+0000\n" "Last-Translator: Anonymous \n" "Language-Team: Bulgarian