diff --git a/application/config/autoload.php b/application/config/autoload.php
index 41f34a10a..33fa16ce6 100644
--- a/application/config/autoload.php
+++ b/application/config/autoload.php
@@ -52,7 +52,7 @@ $autoload['packages'] = array(APPPATH.'third_party');
| $autoload['libraries'] = array('database', 'session', 'xmlrpc');
*/
-$autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Paths', 'Frequency', 'Qra');
+$autoload['libraries'] = array('database', 'session', 'curl', 'OptionsLib', 'Paths', 'Frequency');
/*
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index e03a6f86e..3ed0a9f68 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -30,10 +30,14 @@ function echo_table_col($row, $name) {
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 '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
+ case 'Grid':
+ $ci->load->library('qra');
+ echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $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); } 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 'Frequency':
+ $ci->load->library('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;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
case 'Name': echo '' . ($row->COL_NAME) . ' | '; break;
diff --git a/application/views/qso/components/previous_contacts.php b/application/views/qso/components/previous_contacts.php
index 2a338f50c..f4cf26494 100644
--- a/application/views/qso/components/previous_contacts.php
+++ b/application/views/qso/components/previous_contacts.php
@@ -61,10 +61,14 @@ function echo_table_col($row, $name) {
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 '' . ($ci->qra->echoQrbCalcLink($row->COL_MY_GRIDSQUARE, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
+ case 'Grid':
+ $ci->load->library('qra');
+ echo '' . ($ci->qra->echoQrbCalcLink($row->COL_MY_GRIDSQUARE, $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); } 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 'Frequency':
+ $ci->load->library('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;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
}
diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php
index 45b4ca8e5..94df943a6 100644
--- a/application/views/view_log/partial/log_ajax.php
+++ b/application/views/view_log/partial/log_ajax.php
@@ -31,10 +31,14 @@ function echo_table_col($row, $name) {
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 '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE)) . ' | '; break;
+ case 'Grid':
+ $ci->load->library('qra');
+ echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $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 { 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 'Frequency':
+ $ci->load->library('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;
case 'Operator':echo '' . ($row->COL_OPERATOR) . ' | '; break;
case 'Location':echo '' . ($row->station_profile_name) . ' | '; break;
diff --git a/application/views/visitor/index.php b/application/views/visitor/index.php
index a4b29a6cc..d1679e93c 100644
--- a/application/views/visitor/index.php
+++ b/application/views/visitor/index.php
@@ -27,10 +27,14 @@ function echo_table_col($row, $name) {
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 '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE, true)) . ' | '; break;
+ case 'Grid':
+ $ci->load->library('qra');
+ echo '' . ($ci->qra->echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE, true)) . ' | '; 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 'Frequency':
+ $ci->load->library('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;
case 'Operator': echo '' . ($row->COL_OPERATOR) . ' | '; break;
}