diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index 9f7c057b..3454a706 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -94,6 +94,7 @@ $lang['gen_hamradio_wwff_reference'] = 'WWFF Reference';
$lang['gen_hamradio_dok'] = 'DOK';
$lang['gen_hamradio_state'] = 'State';
$lang['gen_hamradio_iota'] = 'IOTA';
+$lang['gen_hamradio_sota'] = 'SOTA';
$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
$lang['gen_hamradio_sig'] = 'Sig';
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 0baec27e..b23c8326 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -48,6 +48,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -60,6 +61,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -72,6 +74,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -84,6 +87,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -126,6 +130,7 @@
case 'RSTR': echo '
' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -138,6 +143,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -150,6 +156,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -162,6 +169,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php
index 0523f8e6..20f2e8f1 100644
--- a/application/views/qslcard/searchresult.php
+++ b/application/views/qslcard/searchresult.php
@@ -14,6 +14,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -26,6 +27,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -38,6 +40,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -50,6 +53,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -62,6 +66,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -95,6 +100,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -106,6 +112,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -118,6 +125,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -129,6 +137,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -140,6 +149,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
diff --git a/application/views/user/add.php b/application/views/user/add.php
index 7157053f..d8421608 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -146,6 +146,7 @@
+
@@ -160,6 +161,7 @@
+
@@ -174,6 +176,7 @@
+
@@ -188,6 +191,7 @@
+
@@ -202,6 +206,7 @@
+
diff --git a/application/views/user/edit.php b/application/views/user/edit.php
index 3b879e71..a4503096 100644
--- a/application/views/user/edit.php
+++ b/application/views/user/edit.php
@@ -332,6 +332,7 @@
+
@@ -346,6 +347,7 @@
+
@@ -360,6 +362,7 @@
+
@@ -374,6 +377,7 @@
+
@@ -387,6 +391,7 @@
+
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index ec122355..43611c0f 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -14,6 +14,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -27,6 +28,7 @@
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
}
@@ -38,6 +40,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -50,6 +53,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -62,6 +66,7 @@
case 'RSTR': echo $this->lang->line('gen_hamradio_rstr'); break;
case 'Country': echo $this->lang->line('general_word_country'); break;
case 'IOTA': echo $this->lang->line('gen_hamradio_iota'); break;
+ case 'SOTA': echo $this->lang->line('gen_hamradio_sota'); break;
case 'State': echo $this->lang->line('gen_hamradio_state'); break;
case 'Grid': echo $this->lang->line('gen_hamradio_gridsquare'); break;
case 'Band': echo $this->lang->line('gen_hamradio_band'); break;
@@ -110,6 +115,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -121,6 +127,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -133,6 +140,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -144,6 +152,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
@@ -155,6 +164,7 @@
case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '' . $row->COL_SRX . '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
case 'Country': echo ' | ' . ucwords(strtolower(($row->COL_COUNTRY)));; break;
case 'IOTA': echo ' | ' . ($row->COL_IOTA); break;
+ case 'SOTA': echo ' | ' . ($row->COL_SOTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
case 'Band': echo ' | '; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break;
case 'State': echo ' | ' . ($row->COL_STATE); break;
|