diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 3454a706..4501b673 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -96,6 +96,7 @@ $lang['gen_hamradio_state'] = 'State'; $lang['gen_hamradio_iota'] = 'IOTA'; $lang['gen_hamradio_sota'] = 'SOTA'; $lang['gen_hamradio_gridsquare'] = 'Gridsquare'; +$lang['gen_hamradio_operator'] = 'Operator'; $lang['gen_hamradio_sig'] = 'Sig'; $lang['gen_hamradio_sig_info'] = 'Sig Info'; diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index b7f01ca9..45bc6f4a 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -10,6 +10,7 @@ function echo_table_header_col($ctx, $name) { case 'State': echo ''.$ctx->lang->line('gen_hamradio_state').''; break; case 'Grid': echo ''.$ctx->lang->line('gen_hamradio_gridsquare').''; break; case 'Band': echo ''.$ctx->lang->line('gen_hamradio_band').''; break; + case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').''; break; } } @@ -24,6 +25,7 @@ function echo_table_col($row, $name) { 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); } echo ''; break; case 'State': echo '' . ($row->COL_STATE) . ''; break; + case 'Operator': echo '' . ($row->COL_OPERATOR) . ''; break; } } ?> diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php index 20f2e8f1..1217e301 100644 --- a/application/views/qslcard/searchresult.php +++ b/application/views/qslcard/searchresult.php @@ -18,6 +18,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -31,6 +32,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_band'); break; } echo ''; echo ''; @@ -44,6 +46,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -57,6 +60,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -70,6 +74,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; @@ -104,6 +109,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { @@ -116,6 +122,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; @@ -129,6 +136,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { @@ -141,6 +149,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { @@ -153,6 +162,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ' '; diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 1d20cc77..081121d6 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -19,6 +19,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -32,6 +33,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -45,6 +47,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -58,6 +61,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; echo ''; @@ -71,6 +75,7 @@ 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; + case 'Operator': echo $this->lang->line('gen_hamradio_operator'); break; } echo ''; @@ -122,6 +127,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { @@ -134,6 +140,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; @@ -147,6 +154,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { @@ -159,6 +167,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { @@ -171,6 +180,7 @@ 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; + case 'Operator': echo '' . ($row->COL_OPERATOR); break; } echo ''; if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> diff --git a/application/views/user/add.php b/application/views/user/add.php index d8421608..37a9f119 100644 --- a/application/views/user/add.php +++ b/application/views/user/add.php @@ -149,6 +149,7 @@ + @@ -164,6 +165,7 @@ + @@ -179,6 +181,7 @@ + @@ -194,6 +197,7 @@ + @@ -209,6 +213,7 @@ + diff --git a/application/views/user/edit.php b/application/views/user/edit.php index a4503096..abee7af1 100644 --- a/application/views/user/edit.php +++ b/application/views/user/edit.php @@ -335,6 +335,7 @@ + @@ -350,6 +351,7 @@ + @@ -365,6 +367,7 @@ + @@ -380,6 +383,7 @@ +
@@ -394,6 +398,7 @@ +
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index dba57a51..6460ae1b 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -10,6 +10,8 @@ function echo_table_header_col($ctx, $name) { case 'State': echo ''.$ctx->lang->line('gen_hamradio_state').''; break; case 'Grid': echo ''.$ctx->lang->line('gen_hamradio_gridsquare').''; break; case 'Band': echo ''.$ctx->lang->line('gen_hamradio_band').''; break; + case 'Operator': echo ''.$ctx->lang->line('gen_hamradio_operator').''; break; + } } @@ -24,6 +26,7 @@ function echo_table_col($row, $name) { 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); } echo ''; break; case 'State': echo '' . ($row->COL_STATE) . ''; break; + case 'Operator':echo '' . ($row->COL_OPERATOR) . ''; break; } } ?>