diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 43d7c65b..50a8801e 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -17,8 +17,8 @@ function echo_table_header_col($ctx, $name) {
function echo_table_col($row, $name) {
switch($name) {
case 'Mode': echo '
'; echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE . ' | '; break;
- case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';} echo ' | '; break;
- case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';} echo ' | '; break;
+ case 'RSTS': echo '' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';} echo ' | '; break;
+ case 'RSTR': echo '' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';} echo ' | '; 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;
diff --git a/application/views/qslcard/searchresult.php b/application/views/qslcard/searchresult.php
index 537da872..dcb7ef39 100644
--- a/application/views/qslcard/searchresult.php
+++ b/application/views/qslcard/searchresult.php
@@ -101,8 +101,8 @@
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -114,8 +114,8 @@
echo ' | ';
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -128,8 +128,8 @@
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -141,8 +141,8 @@
echo ' | ';
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -154,8 +154,8 @@
echo ' | ';
switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
diff --git a/application/views/search/search_result_ajax.php b/application/views/search/search_result_ajax.php
index da8fa19e..d80e4b96 100644
--- a/application/views/search/search_result_ajax.php
+++ b/application/views/search/search_result_ajax.php
@@ -119,8 +119,8 @@
switch($this->session->userdata('user_column1')==""?'Mode':$this->session->userdata('user_column1')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -132,8 +132,8 @@
echo ' | ';
switch($this->session->userdata('user_column2')==""?'RSTS':$this->session->userdata('user_column2')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -146,8 +146,8 @@
switch($this->session->userdata('user_column3')==""?'RSTR':$this->session->userdata('user_column3')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -159,8 +159,8 @@
echo ' | ';
switch($this->session->userdata('user_column4')==""?'Band':$this->session->userdata('user_column4')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
@@ -172,8 +172,8 @@
echo ' | ';
switch($this->session->userdata('user_column5')==""?'Country':$this->session->userdata('user_column5')) {
case 'Mode': 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 ''; printf("%03d", $row->COL_STX); echo '';}if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
- case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';}if ($row->COL_SRX_STRING) { echo '' . $row->COL_SRX_STRING . '';}; break;
+ case 'RSTS': echo ' | ' . $row->COL_RST_SENT; if ($row->COL_STX) { echo ''; printf("%03d", $row->COL_STX); echo '';} if ($row->COL_STX_STRING) { echo '' . $row->COL_STX_STRING . '';}; break;
+ case 'RSTR': echo ' | ' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo ''; printf("%03d", $row->COL_SRX); echo '';} 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;
|