From 00375acab07f311a5aa9aa0657a5f5893029c5e1 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 18 Jan 2024 00:43:03 +0100 Subject: [PATCH 1/7] grammar --- application/controllers/Lotw.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php index 9fcf38a40..fffdeac3b 100644 --- a/application/controllers/Lotw.php +++ b/application/controllers/Lotw.php @@ -11,7 +11,7 @@ class Lotw extends CI_Controller { | | Note: | If you plan on using any of the code within this class please credit - | Peter, 2M0SQL, a lot of hard work went into building the + | Peter, 2M0SQL. A lot of hard work went into building the | signing of files. | | Big Thanks to Rodrigo PY2RAF for all the help and information about OpenSSL From fcb0a8731a0e072c76f2b5601d04d83a5a7c2bd9 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 18 Jan 2024 01:00:24 +0100 Subject: [PATCH 2/7] adjusted migration comments (all c+p) --- .../migrations/059_add_default_theme_to_options_table.php | 3 +-- application/migrations/060_add_tileserver_to_options.php | 3 +-- application/migrations/061_add_lang_to_options.php | 3 +-- application/migrations/062_add_globalsearch_to_options.php | 3 +-- application/migrations/064_add_user_sota_lookup.php | 3 +-- application/migrations/065_changed_dxcc_tables_utf8mb4.php | 3 +-- application/migrations/066_add_user_hide_notes.php | 3 +-- application/migrations/067_add_index_cqz_prop.php | 3 +-- application/migrations/068_add_cat_timeout_to_options.php | 3 +-- application/migrations/069_add_user_definable_columns.php | 3 +-- application/migrations/070_add_fifth_column.php | 3 +-- application/migrations/072_create_station_logbook_table.php | 3 +-- .../073_create_station_logbook_relationship_table.php | 4 ++-- .../075_add_active_station_logbook_to_user_table.php | 3 +-- .../083_create_station_logbook_relationship_table2.php | 3 +-- .../migrations/102_add_version_two_trigger_to_options.php | 3 +-- application/migrations/130_add_version_to_config.php | 3 +-- 17 files changed, 18 insertions(+), 34 deletions(-) diff --git a/application/migrations/059_add_default_theme_to_options_table.php b/application/migrations/059_add_default_theme_to_options_table.php index b5183fcfc..d79f7b9fb 100644 --- a/application/migrations/059_add_default_theme_to_options_table.php +++ b/application/migrations/059_add_default_theme_to_options_table.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds the theme 'default' as standard/default theme to wavelog. */ class Migration_add_default_theme_to_options_table extends CI_Migration { diff --git a/application/migrations/060_add_tileserver_to_options.php b/application/migrations/060_add_tileserver_to_options.php index 3ecc70875..98d622751 100644 --- a/application/migrations/060_add_tileserver_to_options.php +++ b/application/migrations/060_add_tileserver_to_options.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds the url for the maptileserver to the options table in wavelog */ class Migration_add_tileserver_to_options extends CI_Migration { diff --git a/application/migrations/061_add_lang_to_options.php b/application/migrations/061_add_lang_to_options.php index be28d9996..c915a3b9b 100644 --- a/application/migrations/061_add_lang_to_options.php +++ b/application/migrations/061_add_lang_to_options.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration set's english as default language in the options table */ class Migration_add_lang_to_options extends CI_Migration { diff --git a/application/migrations/062_add_globalsearch_to_options.php b/application/migrations/062_add_globalsearch_to_options.php index 319fec446..02df4f43f 100644 --- a/application/migrations/062_add_globalsearch_to_options.php +++ b/application/migrations/062_add_globalsearch_to_options.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds the global_search to the options table. */ class Migration_add_globalsearch_to_options extends CI_Migration { diff --git a/application/migrations/064_add_user_sota_lookup.php b/application/migrations/064_add_user_sota_lookup.php index ac7d08c34..5a7fd018c 100644 --- a/application/migrations/064_add_user_sota_lookup.php +++ b/application/migrations/064_add_user_sota_lookup.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This adds user_sota_lookup to the users table. */ class Migration_add_user_sota_lookup extends CI_Migration { diff --git a/application/migrations/065_changed_dxcc_tables_utf8mb4.php b/application/migrations/065_changed_dxcc_tables_utf8mb4.php index eb062106c..a8fbe3249 100644 --- a/application/migrations/065_changed_dxcc_tables_utf8mb4.php +++ b/application/migrations/065_changed_dxcc_tables_utf8mb4.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration converts the dxcc_* tables to a utf8mb4 charachter set. */ class Migration_changed_dxcc_tables_utf8mb4 extends CI_Migration { diff --git a/application/migrations/066_add_user_hide_notes.php b/application/migrations/066_add_user_hide_notes.php index c92d21bb1..a08e5840a 100644 --- a/application/migrations/066_add_user_hide_notes.php +++ b/application/migrations/066_add_user_hide_notes.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This allows the user to disable notes in the header menu. */ class Migration_add_user_hide_notes extends CI_Migration { diff --git a/application/migrations/067_add_index_cqz_prop.php b/application/migrations/067_add_index_cqz_prop.php index 5ac00a47a..bd161b2a2 100644 --- a/application/migrations/067_add_index_cqz_prop.php +++ b/application/migrations/067_add_index_cqz_prop.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds index to COL_CQZ and COL_PROP_MODE in the QSO table. */ class Migration_add_index_cqz_prop extends CI_Migration { diff --git a/application/migrations/068_add_cat_timeout_to_options.php b/application/migrations/068_add_cat_timeout_to_options.php index 738eedc85..0f1858c38 100644 --- a/application/migrations/068_add_cat_timeout_to_options.php +++ b/application/migrations/068_add_cat_timeout_to_options.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds a value to the options table which is used as cat_timeout */ class Migration_add_cat_timeout_to_options extends CI_Migration { diff --git a/application/migrations/069_add_user_definable_columns.php b/application/migrations/069_add_user_definable_columns.php index 43a9e620f..60a0ca578 100644 --- a/application/migrations/069_add_user_definable_columns.php +++ b/application/migrations/069_add_user_definable_columns.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration allows the user to define which columns are shown in the logbook. */ class Migration_add_user_definable_columns extends CI_Migration { diff --git a/application/migrations/070_add_fifth_column.php b/application/migrations/070_add_fifth_column.php index cd90db0c8..bf53a1537 100644 --- a/application/migrations/070_add_fifth_column.php +++ b/application/migrations/070_add_fifth_column.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds a fifth column recarding to migration no. 69 */ class Migration_add_fifth_column extends CI_Migration { diff --git a/application/migrations/072_create_station_logbook_table.php b/application/migrations/072_create_station_logbook_table.php index 81ba41a03..7a43932bb 100644 --- a/application/migrations/072_create_station_logbook_table.php +++ b/application/migrations/072_create_station_logbook_table.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* Initial creation of the station logbooks database */ class Migration_create_station_logbook_table extends CI_Migration { diff --git a/application/migrations/073_create_station_logbook_relationship_table.php b/application/migrations/073_create_station_logbook_relationship_table.php index c76871d7b..8b2fd39bb 100644 --- a/application/migrations/073_create_station_logbook_relationship_table.php +++ b/application/migrations/073_create_station_logbook_relationship_table.php @@ -3,8 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* Next step after Migration No. 72 is to create a datatable which contains the relations +* between station logbooks and station locations. */ class Migration_create_station_logbook_relationship_table extends CI_Migration { diff --git a/application/migrations/075_add_active_station_logbook_to_user_table.php b/application/migrations/075_add_active_station_logbook_to_user_table.php index dea42b6bc..bf331d2ca 100644 --- a/application/migrations/075_add_active_station_logbook_to_user_table.php +++ b/application/migrations/075_add_active_station_logbook_to_user_table.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* Allows the user to set which station logbook is the active/selected at the moment. */ class Migration_add_active_station_logbook_to_user_table extends CI_Migration { diff --git a/application/migrations/083_create_station_logbook_relationship_table2.php b/application/migrations/083_create_station_logbook_relationship_table2.php index 4335013b5..8cf4cd084 100644 --- a/application/migrations/083_create_station_logbook_relationship_table2.php +++ b/application/migrations/083_create_station_logbook_relationship_table2.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* Same as Migration No. 073 */ class Migration_create_station_logbook_relationship_table2 extends CI_Migration { diff --git a/application/migrations/102_add_version_two_trigger_to_options.php b/application/migrations/102_add_version_two_trigger_to_options.php index 8e8bd225f..c63c3c92a 100644 --- a/application/migrations/102_add_version_two_trigger_to_options.php +++ b/application/migrations/102_add_version_two_trigger_to_options.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This migration adds an trigger for the switch from 1.* to 2.* */ class Migration_add_version_two_trigger_to_options extends CI_Migration { diff --git a/application/migrations/130_add_version_to_config.php b/application/migrations/130_add_version_to_config.php index 1893b92ae..2bce2913f 100644 --- a/application/migrations/130_add_version_to_config.php +++ b/application/migrations/130_add_version_to_config.php @@ -3,8 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); /* -* This migration creates a table called options which will hold global options needed within wavelog -* removing the need for lots of configuration files. +* This adds the version to the database. */ class Migration_add_version_to_config extends CI_Migration { From 9709499d5ff18ba7ca19f74ad19c45d6f1768849 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 18 Jan 2024 01:16:53 +0100 Subject: [PATCH 3/7] should stay the original call --- updates/clublog_scp.txt | 2 +- updates/lotw_users.csv | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/updates/clublog_scp.txt b/updates/clublog_scp.txt index ea4f164e7..4da1c63d9 100644 --- a/updates/clublog_scp.txt +++ b/updates/clublog_scp.txt @@ -101864,7 +101864,7 @@ T7DX 2M0RWZ 2M0SDV 2M0SMM -4W7EST +2M0SQL 2M0TGD 2M0TNM 2M0TXY diff --git a/updates/lotw_users.csv b/updates/lotw_users.csv index cdbe4fc80..db76736f2 100644 --- a/updates/lotw_users.csv +++ b/updates/lotw_users.csv @@ -455,8 +455,8 @@ 2M0RRT/P,2016-10-13,18:45:55 2M0RWZ,2017-08-23,20:52:08 2M0SDV,2016-12-28,00:30:51 -4W7EST,2020-09-19,18:01:03 -4W7EST/P,2018-06-27,23:45:11 +2M0SQL,2020-09-19,18:01:03 +2M0SQL/P,2018-06-27,23:45:11 2M0TGN,2016-08-01,18:44:01 2M0TXK,2015-01-16,18:12:18 2M0TXY,2018-12-31,20:17:11 From db172360862dec13d8c12edbb29d79f280edd4b2 Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 18 Jan 2024 01:17:20 +0100 Subject: [PATCH 4/7] E-Mail Format --- application/views/email/admin_reset_password.php | 1 + application/views/email/forgot_password.php | 2 +- application/views/email/oqrs_request.php | 2 +- application/views/email/testmail.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application/views/email/admin_reset_password.php b/application/views/email/admin_reset_password.php index dcb546c7b..7de2ffbc6 100644 --- a/application/views/email/admin_reset_password.php +++ b/application/views/email/admin_reset_password.php @@ -12,4 +12,5 @@ Click here to reset your password: Date: Thu, 18 Jan 2024 07:37:19 +0100 Subject: [PATCH 5/7] Update application/config/config.sample.php get rid of never used version Co-authored-by: HB9HIL <80885850+HB9HIL@users.noreply.github.com> --- application/config/config.sample.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/config/config.sample.php b/application/config/config.sample.php index cc2267310..0cd9da1bf 100644 --- a/application/config/config.sample.php +++ b/application/config/config.sample.php @@ -14,7 +14,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); */ $config['app_name'] = "Wavelog"; -$config['app_version'] = "2.4.5"; $config['directory'] = "logbook"; $config['callbook'] = "hamqth"; // Options are hamqth or qrz $config['datadir'] = null; // default to install directory From 4cf4a8f5effdddfbbe7ec423261866da674833b2 Mon Sep 17 00:00:00 2001 From: "Joerg (DJ7NT)" Date: Thu, 18 Jan 2024 07:37:55 +0100 Subject: [PATCH 6/7] get rid of never used version Co-authored-by: HB9HIL <80885850+HB9HIL@users.noreply.github.com> --- install/config/config.php | 1 - 1 file changed, 1 deletion(-) diff --git a/install/config/config.php b/install/config/config.php index 0e2c6b6ea..5261bf582 100644 --- a/install/config/config.php +++ b/install/config/config.php @@ -14,7 +14,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); */ $config['app_name'] = "Wavelog"; -$config['app_version'] = "2.4.5"; $config['directory'] = "%directory%"; $config['callbook'] = "hamqth"; // Options are hamqth or qrz From 357a0532b72e43de725b122ff757c21765cbcf2e Mon Sep 17 00:00:00 2001 From: HB9HIL Date: Thu, 18 Jan 2024 08:13:20 +0100 Subject: [PATCH 7/7] removed comments for app_version in config.php --- application/config/config.sample.php | 1 - install/config/config.php | 1 - 2 files changed, 2 deletions(-) diff --git a/application/config/config.sample.php b/application/config/config.sample.php index 0cd9da1bf..18c67e9c7 100644 --- a/application/config/config.sample.php +++ b/application/config/config.sample.php @@ -8,7 +8,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); |-------------------------------------------------------------------------- | | 'app_name' Name of the App 'Wavelog' -| 'app_version' Set by the dev team. | 'directory' directory where wavelog is installed eg "logger" | 'callbook' Selects which Callbook lookup to use defaults "hamqth" but supports "qrz" */ diff --git a/install/config/config.php b/install/config/config.php index 5261bf582..eeea5f495 100644 --- a/install/config/config.php +++ b/install/config/config.php @@ -8,7 +8,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); |-------------------------------------------------------------------------- | | 'app_name' Name of the App 'Wavelog' -| 'app_version' Set by the dev team. | 'directory' directory where wavelog is installed eg "logger" | 'callbook' Selects which Callbook lookup to use defaults "hamqth" but supports "qrz" */