diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php index 16c94bfb..7752e507 100644 --- a/application/views/search/search_result_ajax.php +++ b/application/views/search/search_result_ajax.php @@ -1,3 +1,86 @@ +COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; + break; + case 'RSTS': + echo $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';}; + break; + case 'RSTR': + echo $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $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 'WWFF': + echo ($row->COL_WWFF_REF); + break; + case 'POTA': + echo ($row->COL_POTA_REF); + break; + case 'Grid': + 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': + 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; + case 'Frequency': + 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); } }; + break; + case 'State': + echo ($row->COL_STATE); + break; + case 'Operator': + echo ($row->COL_OPERATOR); + break; + case 'Location': + echo ($row->station_profile_name); + break; + case 'Name': + echo ($row->COL_NAME); + break; + default: + echo '(unknown col)'; + } +} +?>
@@ -10,84 +93,19 @@ '; - switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - 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; - } + echo_table_header_col($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); echo ''; echo ''; echo ''; echo ''; echo ''; if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> @@ -131,91 +149,16 @@ $ci =& get_instance(); session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) { - case 'Mode': echo ''; break; - case 'RSTR': echo ''; break; - case 'Country': echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; - } - echo ''; - switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { - case 'Mode': echo ''; break; - case 'RSTR': echo ''; break; - case 'Country': echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; - } - echo ''; - - switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { - case 'Mode': echo ''; break; - case 'RSTR': echo ''; break; - case 'Country': echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; - } - echo ''; - switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { - case 'Mode': echo ''; break; - case 'RSTR': echo ''; break; - case 'Country': echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; - } - echo ''; - switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { - case 'Mode': echo ''; break; - case 'RSTR': echo ''; break; - case 'Country': echo ''; } else { if ($row->COL_FREQ != null) { echo ' '.$ci->frequency->hz_to_mhz($row->COL_FREQ).''; } else { echo strtolower($row->COL_BAND); } } echo ''; break; - } + echo ''; if(($this->config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?>
'; - switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - 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; - } + echo_table_header_col($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); echo ''; - switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - 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; - } + echo_table_header_col($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')); echo ''; - switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - 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; - } + echo_table_header_col($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')); echo ''; - switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) { - case 'Mode': echo lang('gen_hamradio_mode'); break; - case 'RSTS': echo lang('gen_hamradio_rsts'); break; - case 'RSTR': echo lang('gen_hamradio_rstr'); break; - case 'Country': echo lang('general_word_country'); break; - case 'IOTA': echo lang('gen_hamradio_iota'); break; - 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; - } + echo_table_header_col($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')); echo ' '; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; - case 'IOTA': echo '' . ($row->COL_IOTA); break; - case 'SOTA': echo '' . ($row->COL_SOTA_REF); break; - 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; - 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 ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; - case 'IOTA': echo '' . ($row->COL_IOTA); break; - case 'SOTA': echo '' . ($row->COL_SOTA_REF); break; - 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; - 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 ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; - case 'IOTA': echo '' . ($row->COL_IOTA); break; - case 'SOTA': echo '' . ($row->COL_SOTA_REF); break; - 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; - 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 ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; - case 'IOTA': echo '' . ($row->COL_IOTA); break; - case 'SOTA': echo '' . ($row->COL_SOTA_REF); break; - 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; - 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 ''; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; break; - case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_STX_STRING . '';} echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">'; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo ' COL_CONTEST_ID:"n/a").'" class="badge text-bg-light">' . $row->COL_SRX_STRING . '';} echo '' . ucwords(strtolower(($row->COL_COUNTRY)));; break; - case 'IOTA': echo '' . ($row->COL_IOTA); break; - case 'SOTA': echo '' . ($row->COL_SOTA_REF); break; - 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; - 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 ''; + echo_table_col($row, $this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')); + echo ''; + echo_table_col($row, $this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')); + echo ''; + echo_table_col($row, $this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')); + echo ''; + echo_table_col($row, $this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')); + echo ''; + echo_table_col($row, $this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')); echo '