diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php
index 568ba118..6dc3b456 100644
--- a/application/language/english/general_words_lang.php
+++ b/application/language/english/general_words_lang.php
@@ -110,6 +110,7 @@ $lang['gen_hamradio_sota'] = 'SOTA';
$lang['gen_hamradio_wwff'] = 'WWFF';
$lang['gen_hamradio_pota'] = 'POTA';
$lang['gen_hamradio_gridsquare'] = 'Gridsquare';
+$lang['gen_hamradio_distance'] = 'Distance';
$lang['gen_hamradio_operator'] = 'Operator';
$lang['gen_hamradio_sig'] = 'Sig';
diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php
index 9318be83..61865b04 100644
--- a/application/language/german/general_words_lang.php
+++ b/application/language/german/general_words_lang.php
@@ -111,6 +111,7 @@ $lang['gen_hamradio_sota'] = 'SOTA';
$lang['gen_hamradio_wwff'] = 'WWFF';
$lang['gen_hamradio_pota'] = 'POTA';
$lang['gen_hamradio_gridsquare'] = 'Planquadrat';
+$lang['gen_hamradio_distance'] = 'Entfernung';
$lang['gen_hamradio_operator'] = 'Operator';
$lang['gen_hamradio_sig'] = 'Sig';
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 8850b8be..5300a281 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -11,6 +11,7 @@ function echo_table_header_col($ctx, $name) {
case 'POTA': echo '
'.$ctx->lang->line('gen_hamradio_pota').' | '; break;
case 'State': echo ''.$ctx->lang->line('gen_hamradio_state').' | '; break;
case 'Grid': echo ''.$ctx->lang->line('gen_hamradio_gridsquare').' | '; break;
+ case 'Distance': echo ''.$ctx->lang->line('gen_hamradio_distance').' | '; break;
case 'Band': echo ''.$ctx->lang->line('gen_hamradio_band').' | '; break;
case 'Frequency': echo ''.$ctx->lang->line('gen_hamradio_frequency').' | '; break;
case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').' | '; break;
@@ -29,6 +30,7 @@ function echo_table_col($row, $name) {
case 'WWFF': echo '' . ($row->COL_WWFF_REF) . ' | '; break;
case 'POTA': echo '' . ($row->COL_POTA_REF) . ' | '; break;
case 'Grid': echo ''; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo ' | '; break;
+ case 'Distance': echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { echo strtolower($row->COL_BAND); } echo ''; break;
case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php
index e722be5b..195ed3e0 100644
--- a/application/views/qslcard/searchresult.php
+++ b/application/views/qslcard/searchresult.php
@@ -17,6 +17,7 @@
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -32,6 +33,7 @@
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_band'); break;
@@ -47,6 +49,7 @@
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -62,6 +65,7 @@
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -77,6 +81,7 @@
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -114,6 +119,7 @@
case 'WWFF': echo '' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -129,6 +135,7 @@
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -145,6 +152,7 @@
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -160,6 +168,7 @@
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -175,6 +184,7 @@
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index cc358d13..f47f04c8 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -19,6 +19,7 @@ $ci =& get_instance();
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -34,6 +35,7 @@ $ci =& get_instance();
case 'State': echo lang('gen_hamradio_state'); break;
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -49,6 +51,7 @@ $ci =& get_instance();
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -64,6 +67,7 @@ $ci =& get_instance();
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -79,6 +83,7 @@ $ci =& get_instance();
case 'SOTA': echo lang('gen_hamradio_sota'); break;
case 'State': echo lang('gen_hamradio_state'); break;
case 'Grid': echo lang('gen_hamradio_gridsquare'); break;
+ case 'Distance': echo lang('gen_hamradio_distance'); break;
case 'Band': echo lang('gen_hamradio_band'); break;
case 'Frequency': echo lang('gen_hamradio_frequency'); break;
case 'Operator': echo lang('gen_hamradio_operator'); break;
@@ -133,6 +138,7 @@ $ci =& get_instance();
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -149,6 +155,7 @@ $ci =& get_instance();
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -166,6 +173,7 @@ $ci =& get_instance();
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -182,6 +190,7 @@ $ci =& get_instance();
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
@@ -198,6 +207,7 @@ $ci =& get_instance();
case 'WWFF': echo ' | ' . ($row->COL_WWFF_REF); break;
case 'POTA': echo ' | ' . ($row->COL_POTA_REF); break;
case 'Grid': echo ' | '; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break;
+ case 'Distance':echo ' | ' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); 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;
case 'Operator': echo ' | ' . ($row->COL_OPERATOR); break;
diff --git a/application/views/user/add.php b/application/views/user/add.php
index 0f3cf3ca..d3a0492e 100644
--- a/application/views/user/add.php
+++ b/application/views/user/add.php
@@ -313,6 +313,8 @@
+
@@ -342,6 +344,8 @@
+
@@ -371,6 +375,8 @@
+
@@ -400,6 +406,8 @@
+
@@ -430,6 +438,8 @@
+
+
@@ -379,6 +380,7 @@
+
@@ -398,6 +400,7 @@
+
@@ -417,6 +420,7 @@
+
@@ -436,6 +440,7 @@
+
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index cb4ea12e..39e7ed72 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -11,6 +11,7 @@ function echo_table_header_col($ctx, $name) {
case 'POTA': echo ' | '.$ctx->lang->line('gen_hamradio_pota').' | '; break;
case 'State': echo ''.$ctx->lang->line('gen_hamradio_state').' | '; break;
case 'Grid': echo ''.$ctx->lang->line('gen_hamradio_gridsquare').' | '; break;
+ case 'Distance': echo ''.$ctx->lang->line('gen_hamradio_distance').' | '; break;
case 'Band': echo ''.$ctx->lang->line('gen_hamradio_band').''; break;
case 'Frequency': echo ' | '.$ctx->lang->line('gen_hamradio_frequency').' | '; break;
case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').' | '; break;
@@ -30,6 +31,7 @@ function echo_table_col($row, $name) {
case 'WWFF': echo '' . ($row->COL_WWFF_REF) . ' | '; break;
case 'POTA': echo '' . ($row->COL_POTA_REF) . ' | '; break;
case 'Grid': echo ''; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo ' | '; break;
+ case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { if ($row->COL_FREQ != null) { echo ''. strtolower($row->COL_BAND).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'Frequency': echo ''; if($row->COL_SAT_NAME != null) { echo ''; if ($row->COL_FREQ != null) { echo ''.$row->COL_SAT_NAME.''; } else { echo $row->COL_SAT_NAME; } echo ' | '; } else { if ($row->COL_FREQ != null) { echo ''.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index 3194abcb..c34b6935 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -9,6 +9,7 @@ function echo_table_header_col($ctx, $name) {
case 'SOTA': echo ''.$ctx->lang->line('gen_hamradio_sota').' | '; break;
case 'State': echo ''.$ctx->lang->line('gen_hamradio_state').' | '; break;
case 'Grid': echo ''.$ctx->lang->line('gen_hamradio_gridsquare').' | '; break;
+ case 'Distance': echo ''.$ctx->lang->line('gen_hamradio_distance').' | '; break;
case 'Band': echo ''.$ctx->lang->line('gen_hamradio_band').' | '; break;
case 'Frequency': echo ''.$ctx->lang->line('gen_hamradio_frequency').' | '; break;
case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').' | '; break;
@@ -27,6 +28,7 @@ function echo_table_col($row, $name) {
case 'WWFF': echo '' . ($row->COL_WWFF_REF) . ' | '; break;
case 'POTA': echo '' . ($row->COL_POTA_REF) . ' | '; break;
case 'Grid': echo ''; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo ' | '; break;
+ case 'Distance':echo '' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . ' | '; break;
case 'Band': echo ''; if($row->COL_SAT_NAME != null) { echo ''.$row->COL_SAT_NAME.' | '; } else { echo strtolower($row->COL_BAND); } echo ''; break;
case 'Frequency': echo ''; if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } echo ' | '; break;
case 'State': echo '' . ($row->COL_STATE) . ' | '; break;