From a052951bfd9994cc89a3c9042c5c09a3c19aa1de Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 7 Jan 2025 13:16:23 +0000 Subject: [PATCH 1/7] Fixes issue #3247 --- .../migrations/177_add_dxped_url_option.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/application/migrations/177_add_dxped_url_option.php b/application/migrations/177_add_dxped_url_option.php index d461ec87..cfbec47f 100644 --- a/application/migrations/177_add_dxped_url_option.php +++ b/application/migrations/177_add_dxped_url_option.php @@ -11,11 +11,17 @@ class Migration_add_dxped_url_option extends CI_Migration { public function up() { - $data = array( - array('option_name' => "dxped_url", 'option_value' => "https://cdn.cloudlog.org/read_ng3k_dxped_list.php", 'autoload' => "yes"), - ); + // Check if dxped_url is already in the options table + if ($this->db->where('option_name', 'dxped_url')->count_all_results('options') == 0) { + // Insert dxped_url option + $data = array( + 'option_name' => "dxped_url", + 'option_value' => "https://cdn.cloudlog.org/read_ng3k_dxped_list.php", + 'autoload' => "yes" + ); + $this->db->insert('options', $data); + } - $this->db->insert_batch('options', $data); } public function down() From 5bbeb0962d2e71f932fbb78256e1ae1607bed3d1 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 7 Jan 2025 13:22:08 +0000 Subject: [PATCH 2/7] Increase the lotw password size in the database Fixes #3244 --- application/config/migration.php | 2 +- .../192_increase_lotwpass_field_val.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 application/migrations/192_increase_lotwpass_field_val.php diff --git a/application/config/migration.php b/application/config/migration.php index ed733d72..6b725382 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 191; +$config['migration_version'] = 192; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/192_increase_lotwpass_field_val.php b/application/migrations/192_increase_lotwpass_field_val.php new file mode 100644 index 00000000..b5001a41 --- /dev/null +++ b/application/migrations/192_increase_lotwpass_field_val.php @@ -0,0 +1,31 @@ +dbforge->modify_column('users', array( + 'user_lotw_password' => array( + 'name' => 'user_lotw_password', + 'type' => 'VARCHAR', + 'constraint' => '255', + 'null' => TRUE + ) + )); + } + + public function down() + { + // Reset it back to 64 + $this->dbforge->modify_column('users', array( + 'user_lotw_password' => array( + 'name' => 'user_lotw_password', + 'type' => 'VARCHAR', + 'constraint' => '64', + 'null' => TRUE + ) + )); + } +} From 14816383a265d8addb57517cf146e046e3784442 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Tue, 7 Jan 2025 13:27:39 +0000 Subject: [PATCH 3/7] Increase QTH column for logged QSOs Fixes #3236 --- application/config/migration.php | 2 +- .../193_increase_qth_column_size.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 application/migrations/193_increase_qth_column_size.php diff --git a/application/config/migration.php b/application/config/migration.php index 6b725382..04d4b909 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 192; +$config['migration_version'] = 193; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/193_increase_qth_column_size.php b/application/migrations/193_increase_qth_column_size.php new file mode 100644 index 00000000..7f76b910 --- /dev/null +++ b/application/migrations/193_increase_qth_column_size.php @@ -0,0 +1,31 @@ +config->item('table_name') change COL_QTH to be varchar 255 + $this->dbforge->modify_column($this->config->item('table_name'), array( + 'COL_QTH' => array( + 'name' => 'COL_QTH', + 'type' => 'VARCHAR', + 'constraint' => '255', + 'null' => TRUE + ) + )); + } + + public function down() + { + // Change it back to 64 + $this->dbforge->modify_column($this->config->item('table_name'), array( + 'COL_QTH' => array( + 'name' => 'COL_QTH', + 'type' => 'VARCHAR', + 'constraint' => '64', + 'null' => TRUE + ) + )); + } +} From a0971dc8b3be0ba7d7a41263eb2b67b2605733ec Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 15 Jan 2025 16:30:17 +0000 Subject: [PATCH 4/7] Unused CSS files called fixes #3250 --- application/views/interface_assets/header.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 50fea142..12f282d8 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -22,10 +22,7 @@ - - - - + From b333494ecfdfb7b4719f3f778208a11734da3757 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Mar 2025 13:51:35 +0000 Subject: [PATCH 5/7] [Sats] Added SO-124 to json file to populate dropdowns --- assets/json/satellite_data.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/assets/json/satellite_data.json b/assets/json/satellite_data.json index 5349a39b..978465ac 100644 --- a/assets/json/satellite_data.json +++ b/assets/json/satellite_data.json @@ -487,6 +487,18 @@ ] } }, + "SO-124":{ + "Modes":{ + "V/U":[ + { + "Uplink_Mode":"FM", + "Uplink_Freq":"145925000", + "Downlink_Mode":"FM", + "Downlink_Freq":"436885000" + } + ] + } + }, "SONATE-2":{ "Modes":{ "V":[ From 3052986a90aa1b1ae1dba96dc69e139e1da1fe05 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Mar 2025 21:46:32 +0000 Subject: [PATCH 6/7] Set SO-124 to upload to Lotw --- application/config/migration.php | 2 +- .../migrations/194_upload_so124_to_lotw.php | 27 +++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 application/migrations/194_upload_so124_to_lotw.php diff --git a/application/config/migration.php b/application/config/migration.php index 04d4b909..0491cbfd 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 193; +$config['migration_version'] = 194; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/194_upload_so124_to_lotw.php b/application/migrations/194_upload_so124_to_lotw.php new file mode 100644 index 00000000..d8abb8a7 --- /dev/null +++ b/application/migrations/194_upload_so124_to_lotw.php @@ -0,0 +1,27 @@ +db->set('COL_SAT_NAME', 'SO-124'); + $this->db->where('COL_SAT_NAME', 'HADES-R'); + $this->db->update($this->config->item('table_name')); + log_message('info', 'Migration: Updated COL_SAT_NAME to SO-124 for HADES-R'); + + // update column COL_LOTW_QSL_SENT to N if its SO-124 + $this->db->set('COL_LOTW_QSL_SENT', 'N'); + $this->db->where('COL_SAT_NAME', 'SO-124'); + $this->db->update($this->config->item('table_name')); + log_message('info', 'Migration: Set COL_LOTW_QSL_SENT to N for SO-124'); + + } + + public function down() + { + // Not Possible + } +} From 27a49831171dd587c1781aad075dcd8e97360e92 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Wed, 5 Mar 2025 21:52:19 +0000 Subject: [PATCH 7/7] Tag version 2.6.17 --- application/config/migration.php | 2 +- application/migrations/195_tag_2_6_17.php | 30 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 application/migrations/195_tag_2_6_17.php diff --git a/application/config/migration.php b/application/config/migration.php index 0491cbfd..aebf9841 100644 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = TRUE; | */ -$config['migration_version'] = 194; +$config['migration_version'] = 195; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/195_tag_2_6_17.php b/application/migrations/195_tag_2_6_17.php new file mode 100644 index 00000000..458828d6 --- /dev/null +++ b/application/migrations/195_tag_2_6_17.php @@ -0,0 +1,30 @@ +db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.6.17')); + + // Trigger Version Info Dialog + $this->db->where('option_type', 'version_dialog'); + $this->db->where('option_name', 'confirmed'); + $this->db->update('user_options', array('option_value' => 'false')); + + } + + public function down() + { + $this->db->where('option_name', 'version'); + $this->db->update('options', array('option_value' => '2.6.16')); + } +} \ No newline at end of file