Merge branch 'rename_cl' of github.com:int2001/wavelog into rename_cl

2026-03-22 10:24:14 +00:00 · 2024-01-18 10:44:46 +00:00
parent 707a26ed9b 357a0532b7
commit 3937441ebf
26 changed files with 26 additions and 45 deletions
--- a/application/config/config.sample.php
+++ b/application/config/config.sample.php
@@ -8,13 +8,11 @@ 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"
 */

 $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
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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: <?php echo site_url('user/reset_password/').$
 If you didn't request any password reset, just ignore this email and talk to an admin of your Wavelog instance.

 Regards,
+
 Wavelog
--- a/application/views/email/forgot_password.php
+++ b/application/views/email/forgot_password.php
@@ -12,4 +12,4 @@ If you didn't request this just ignore.

 Regards,

-Wavelog.
+Wavelog
--- a/application/views/email/oqrs_request.php
+++ b/application/views/email/oqrs_request.php
@@ -11,4 +11,4 @@ Please log into your Wavelog and process it.

 Regards,

-Wavelog.
+Wavelog
--- a/application/views/email/testmail.php
+++ b/application/views/email/testmail.php
@@ -6,4 +6,4 @@ If you received this email, your mail settings are correct.

 Regards,

-Wavelog.
+Wavelog
--- a/install/config/config.php
+++ b/install/config/config.php
@@ -8,13 +8,11 @@ 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"
 */

 $config['app_name'] = "Wavelog";
-$config['app_version'] = "2.4.5";
 $config['directory'] = "%directory%";
 $config['callbook'] = "hamqth"; // Options are hamqth or qrz

--- a/updates/clublog_scp.txt
+++ b/updates/clublog_scp.txt
@@ -101864,7 +101864,7 @@ T7DX
 2M0RWZ
 2M0SDV
 2M0SMM
-4W7EST
+2M0SQL
 2M0TGD
 2M0TNM
 2M0TXY
--- 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