diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index 87343ae5..2ab204b6 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -188,7 +188,7 @@ class Contesting extends CI_Controller { $result = $this->Contesting_model->checkIfWorkedBefore($call, $band, $mode, $contest); header('Content-Type: application/json'); - if ($result->num_rows()) { + if ($result && $result->num_rows()) { echo json_encode(array('message' => 'Worked before')); } return; diff --git a/application/controllers/Debug.php b/application/controllers/Debug.php index 25bffcb6..5d8d2a9c 100644 --- a/application/controllers/Debug.php +++ b/application/controllers/Debug.php @@ -1,69 +1,65 @@ load->model('user_model'); - if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } - } - - /* User Facing Links to Backup URLs */ - public function index() - { + if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + } + + /* User Facing Links to Backup URLs */ + public function index() + { $this->load->helper('file'); + $this->load->model('MigrationVersion'); + + $data['migration_version'] = $this->MigrationVersion->getMigrationVersion(); + // Test writing to backup folder - if ( ! write_file('backup/myfile.txt', "dummydata")) - { - $data['backup_folder'] = false; - } - else - { - if(unlink(realpath('backup/myfile.txt'))) { - $data['backup_folder'] = true; - } else { - $data['backup_folder'] = false; - } - } + $backup_folder = $this->is_really_writable('backup'); + $data['backup_folder'] = $backup_folder; // Test writing to updates folder - if ( ! write_file('updates/myfile.txt', "dummydata")) - { - $data['updates_folder'] = false; - } - else - { - if(unlink(realpath('updates/myfile.txt'))) { - $data['updates_folder'] = true; - } else { - $data['updates_folder'] = false; - } - } + $updates_folder = $this->is_really_writable('updates'); + $data['updates_folder'] = $updates_folder; // Test writing to uploads folder - if ( ! write_file('uploads/myfile.txt', "dummydata")) - { - $data['uploads_folder'] = false; + $uploads_folder = $this->is_really_writable('uploads'); + $data['uploads_folder'] = $uploads_folder; + + $data['page_title'] = "Debug"; + + $this->load->view('interface_assets/header', $data); + $this->load->view('debug/main'); + $this->load->view('interface_assets/footer'); + } + + private function is_really_writable($folder) + { + // Get the absolute path to the folder + $path = FCPATH . $folder; + + // Check if the folder exists + if (!file_exists($path)) { + return false; } - else - { - if(unlink(realpath('uploads/myfile.txt'))) { - $data['uploads_folder'] = true; - } else { - $data['uploads_folder'] = false; + + // Check if the folder is writable + if (is_writable($path)) { + // Check if the subdirectories are writable (recursive check) + $iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)); + foreach ($iterator as $item) { + if (!is_writable($item->getPathname())) { + return false; + } } + + return true; } - - - $data['page_title'] = "Debug"; - - $this->load->view('interface_assets/header', $data); - $this->load->view('debug/main'); - $this->load->view('interface_assets/footer'); - } - - -} \ No newline at end of file + return false; + } +} diff --git a/application/language/bulgarian/general_words_lang.php b/application/language/bulgarian/general_words_lang.php index 874f3a63..65724ec1 100644 --- a/application/language/bulgarian/general_words_lang.php +++ b/application/language/bulgarian/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/bulgarian/qso_lang.php b/application/language/bulgarian/qso_lang.php index 80f151e4..fd9c5198 100644 --- a/application/language/bulgarian/qso_lang.php +++ b/application/language/bulgarian/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/chinese_simplified/general_words_lang.php b/application/language/chinese_simplified/general_words_lang.php index 45bc556a..498f7f48 100644 --- a/application/language/chinese_simplified/general_words_lang.php +++ b/application/language/chinese_simplified/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/chinese_simplified/qso_lang.php b/application/language/chinese_simplified/qso_lang.php index f2074c99..288aadc2 100644 --- a/application/language/chinese_simplified/qso_lang.php +++ b/application/language/chinese_simplified/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/czech/general_words_lang.php b/application/language/czech/general_words_lang.php index 11a88145..d25662e2 100644 --- a/application/language/czech/general_words_lang.php +++ b/application/language/czech/general_words_lang.php @@ -207,3 +207,5 @@ $lang['southamerica'] = 'Jižní Amerika'; $lang['gen_band_selection'] = 'Výběr pásma'; $lang['general_word_today'] = 'Dnes'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/czech/qso_lang.php b/application/language/czech/qso_lang.php index edac1748..37a69017 100644 --- a/application/language/czech/qso_lang.php +++ b/application/language/czech/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/dutch/general_words_lang.php b/application/language/dutch/general_words_lang.php index 939a7a9a..279ab280 100644 --- a/application/language/dutch/general_words_lang.php +++ b/application/language/dutch/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/dutch/qso_lang.php b/application/language/dutch/qso_lang.php index d66fea75..a01117d8 100644 --- a/application/language/dutch/qso_lang.php +++ b/application/language/dutch/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 5a0e3439..716b1f7c 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -210,3 +210,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/english/qso_lang.php b/application/language/english/qso_lang.php index 8b1e38ec..337b7f20 100644 --- a/application/language/english/qso_lang.php +++ b/application/language/english/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/finnish/general_words_lang.php b/application/language/finnish/general_words_lang.php index 3b54c7af..8130c602 100644 --- a/application/language/finnish/general_words_lang.php +++ b/application/language/finnish/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/finnish/qso_lang.php b/application/language/finnish/qso_lang.php index 82bd9aa0..7a657f9a 100644 --- a/application/language/finnish/qso_lang.php +++ b/application/language/finnish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/french/general_words_lang.php b/application/language/french/general_words_lang.php index 74a26604..90b0394c 100644 --- a/application/language/french/general_words_lang.php +++ b/application/language/french/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/french/qso_lang.php b/application/language/french/qso_lang.php index fe660b5e..6a49e46f 100644 --- a/application/language/french/qso_lang.php +++ b/application/language/french/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index 3d55427c..b9214ccf 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -210,3 +210,5 @@ $lang['dashboard_php_version_warning'] = 'Die PHP Version is zu alt. Benötigt w $lang['dashboard_country_files_warning'] = 'Die Länderlisten müssen aktualisiert werden! Klicke hier, um das zu tun!'; $lang['dashboard_locations_warning'] = 'Ea wurde kein Stationsstandort angelegt! Klicke hier, um das zu tun!'; $lang['dashboard_logbooks_warning'] = 'Es wurde kein Stationslogbuch angelegt. Klicke hier, um das zu tun!'; + +$lang['hams_at_no_activations_found'] = 'Keine bevorstehenden Aktivierungen gefunden. Bitte später noch einmal vorbeischauen.'; diff --git a/application/language/german/qso_lang.php b/application/language/german/qso_lang.php index 7fb52be6..df257a0d 100644 --- a/application/language/german/qso_lang.php +++ b/application/language/german/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Stationsstandort nicht ausgewählt"; $lang['qso_simplefle_error_operator'] = "'Operator' Feld ist leer"; $lang['qso_simplefle_warning_reset'] = "Warnung! Willst du wirklich alles zurücksetzen?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO das Band und/oder der Mode fehlt!"; +$lang['qso_simplefle_warning_missing_time'] = "Warnung! Du kannst die QSO Liste nicht loggen, da bei manchen QSO die Zeit fehlt!"; $lang['qso_simplefle_warning_example_data'] = "Achtung! Das Daten Feld enthält Beispiel Daten. Lösche zuerst die QSO Daten!"; $lang['qso_simplefle_confirm_save_to_log'] = "Bist du dir sicher, dass du diese QSO loggen und die Eingabe zurücksetzen willst?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO geloggt!"; diff --git a/application/language/greek/general_words_lang.php b/application/language/greek/general_words_lang.php index 550d6166..da2e9a55 100644 --- a/application/language/greek/general_words_lang.php +++ b/application/language/greek/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/greek/qso_lang.php b/application/language/greek/qso_lang.php index ac2c9871..f038d30b 100644 --- a/application/language/greek/qso_lang.php +++ b/application/language/greek/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/italian/general_words_lang.php b/application/language/italian/general_words_lang.php index fc8fd0b6..b3965505 100644 --- a/application/language/italian/general_words_lang.php +++ b/application/language/italian/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/italian/qso_lang.php b/application/language/italian/qso_lang.php index 76c75453..3ae7c3bb 100644 --- a/application/language/italian/qso_lang.php +++ b/application/language/italian/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/polish/general_words_lang.php b/application/language/polish/general_words_lang.php index 3229e46e..22ada7cd 100644 --- a/application/language/polish/general_words_lang.php +++ b/application/language/polish/general_words_lang.php @@ -207,3 +207,5 @@ $lang['southamerica'] = 'South America'; $lang['gen_band_selection'] = 'Band selection'; $lang['general_word_today'] = 'Today'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/polish/qso_lang.php b/application/language/polish/qso_lang.php index b988de26..11b6da4f 100644 --- a/application/language/polish/qso_lang.php +++ b/application/language/polish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/russian/general_words_lang.php b/application/language/russian/general_words_lang.php index 9f2c9b16..7afbdb95 100644 --- a/application/language/russian/general_words_lang.php +++ b/application/language/russian/general_words_lang.php @@ -213,3 +213,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/russian/qso_lang.php b/application/language/russian/qso_lang.php index 881937b1..f42e4075 100644 --- a/application/language/russian/qso_lang.php +++ b/application/language/russian/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/spanish/general_words_lang.php b/application/language/spanish/general_words_lang.php index 74f0e6ee..53c01bfc 100644 --- a/application/language/spanish/general_words_lang.php +++ b/application/language/spanish/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/spanish/qso_lang.php b/application/language/spanish/qso_lang.php index 6ba52aa9..d4087461 100644 --- a/application/language/spanish/qso_lang.php +++ b/application/language/spanish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/swedish/general_words_lang.php b/application/language/swedish/general_words_lang.php index d386199d..26344d1c 100644 --- a/application/language/swedish/general_words_lang.php +++ b/application/language/swedish/general_words_lang.php @@ -213,3 +213,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/swedish/qso_lang.php b/application/language/swedish/qso_lang.php index 8eddd4be..80b0dd0b 100644 --- a/application/language/swedish/qso_lang.php +++ b/application/language/swedish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/language/turkish/general_words_lang.php b/application/language/turkish/general_words_lang.php index 0f4f4ff0..3eba7eb7 100644 --- a/application/language/turkish/general_words_lang.php +++ b/application/language/turkish/general_words_lang.php @@ -212,3 +212,5 @@ $lang['dashboard_php_version_warning'] = 'You need to upgrade your PHP version. $lang['dashboard_country_files_warning'] = 'You need to update country files! Go here to do it!'; $lang['dashboard_locations_warning'] = 'You have no station locations. Go here to create it!'; $lang['dashboard_logbooks_warning'] = 'You have no station logbook. Go here to create it!'; + +$lang['hams_at_no_activations_found'] = 'No upcoming activations found. Please check back later.'; diff --git a/application/language/turkish/qso_lang.php b/application/language/turkish/qso_lang.php index e3e8b6d1..3e9516d7 100644 --- a/application/language/turkish/qso_lang.php +++ b/application/language/turkish/qso_lang.php @@ -71,6 +71,7 @@ $lang['qso_simplefle_error_stationcall'] = "Station Call is not selected"; $lang['qso_simplefle_error_operator'] = "'Operator' Field is empty"; $lang['qso_simplefle_warning_reset'] = "Warning! Do you really want to reset everything?"; $lang['qso_simplefle_warning_missing_band_mode'] = "Warning! You can't log the QSO List, because some QSO don't have band and/or mode defined!"; +$lang['qso_simplefle_warning_missing_time'] = "Warning! You can't log the QSO List, because some QSO don't have a time defined!"; $lang['qso_simplefle_warning_example_data'] = "Attention! The Data Field containes example data. First Clear Logging Session!"; $lang['qso_simplefle_confirm_save_to_log'] = "Are you sure that you want to add these QSO to the Log and clear the session?"; $lang['qso_simplefle_success_save_to_log_header'] = "QSO Logged!"; diff --git a/application/models/Bands.php b/application/models/Bands.php index b8bbf594..d3aac99c 100644 --- a/application/models/Bands.php +++ b/application/models/Bands.php @@ -57,7 +57,7 @@ class Bands extends CI_Model { $results = array(); foreach($result as $band) { - $results['b'.strtoupper($band->band)] = array('cw' => $band->cw, 'ssb' => $band->ssb, 'digi' => $band->data); + $results['b'.strtoupper($band->band)] = array('CW' => $band->cw, 'SSB' => $band->ssb, 'DIGI' => $band->data); } return $results; diff --git a/application/models/Contesting_model.php b/application/models/Contesting_model.php index 7bd89215..3ab63248 100644 --- a/application/models/Contesting_model.php +++ b/application/models/Contesting_model.php @@ -214,7 +214,7 @@ class Contesting_model extends CI_Model { $contest_session = $this->getSession(); - if ($contest_session) { + if ($contest_session && $contest_session->qso != "") { $qsoarray = explode(',', $contest_session->qso); $date = DateTime::createFromFormat('d-m-Y H:i:s', $qsoarray[0]); diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index bd54ec0a..fdeef86e 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -289,10 +289,10 @@ class Logbook_model extends CI_Model { } // Decide whether its single gridsquare or a multi which makes it vucc_grids - if (strpos(trim($this->input->post('locator')), ',') !== false) { - $data['COL_VUCC_GRIDS'] = strtoupper(trim($this->input->post('locator'))); + if (strpos(trim(xss_clean($this->input->post('locator')) ?? ''), ',') !== false) { + $data['COL_VUCC_GRIDS'] = strtoupper(trim(xss_clean($this->input->post('locator')) ?? '')); } else { - $data['COL_GRIDSQUARE'] = strtoupper(trim($this->input->post('locator'))); + $data['COL_GRIDSQUARE'] = strtoupper(trim(xss_clean($this->input->post('locator')) ?? '')); } // if eQSL username set, default SENT & RCVD to 'N' else leave as null diff --git a/application/models/MigrationVersion.php b/application/models/MigrationVersion.php new file mode 100644 index 00000000..bec7d47a --- /dev/null +++ b/application/models/MigrationVersion.php @@ -0,0 +1,20 @@ +db->select_max('version'); + $query = $this->db->get('migrations'); + $migration_version = $query->row(); + + if ($query->num_rows() == 1) { + $migration_version = $query->row()->version; + return $migration_version; + } else { + return null; + } + } + +} + +?> diff --git a/application/views/components/hamsat/table.php b/application/views/components/hamsat/table.php index ebda28b7..e218916f 100644 --- a/application/views/components/hamsat/table.php +++ b/application/views/components/hamsat/table.php @@ -2,12 +2,18 @@
This data is from https://hams.at/
+ +| Date | Time | Callsign | +Comment | Satellite | Gridsquare(s) | @@ -44,13 +50,16 @@ $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); $CI->load->model('logbook_model'); $call_worked = $CI->logbook_model->check_if_callsign_worked_in_logbook($rove['callsign'], $logbooks_locations_array, "SAT"); - echo " "; if ($call_worked != 0) { echo "".$rove['callsign'].""; } else { echo $rove['callsign']; } - echo ""; + ?> + + | + | = $rove['satellite'] ?> | @@ -87,4 +96,5 @@
|---|