diff --git a/application/controllers/Logbookadvanced.php b/application/controllers/Logbookadvanced.php index 89a356453..20bb51841 100644 --- a/application/controllers/Logbookadvanced.php +++ b/application/controllers/Logbookadvanced.php @@ -201,6 +201,17 @@ class Logbookadvanced extends CI_Controller { $this->load->view('adif/data/exportall', $data); } + function export_to_adif_params() { + $this->load->model('logbookadvanced_model'); + + $postdata = $this->input->post(); + $postdata['user_id'] = (int)$this->session->userdata('user_id'); + $postdata['qsoresults'] = 'All'; + $data['qsos'] = $this->logbookadvanced_model->getSearchResult($postdata); + + $this->load->view('adif/data/exportall', $data); + } + function update_qsl() { $this->load->model('logbookadvanced_model'); @@ -306,7 +317,7 @@ class Logbookadvanced extends CI_Controller { 'ids' => xss_clean($this->input->post('ids')) ); - $result = $this->logbookadvanced_model->searchDb($searchCriteria); + $result = $this->logbookadvanced_model->getSearchResultArray($searchCriteria); $this->prepareMappedQSos($result); } @@ -347,7 +358,7 @@ class Logbookadvanced extends CI_Controller { 'qslimages' => xss_clean($this->input->post('qslimages')), ); - $result = $this->logbookadvanced_model->searchDb($searchCriteria); + $result = $this->logbookadvanced_model->getSearchResultArray($searchCriteria); $this->prepareMappedQSos($result); } diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php index 6d8205caa..33ef9b1ff 100644 --- a/application/models/Logbookadvanced_model.php +++ b/application/models/Logbookadvanced_model.php @@ -208,7 +208,11 @@ class Logbookadvanced_model extends CI_Model { $where = "AND $where"; } - $limit = $searchCriteria['qsoresults']; + $limit = ''; + + if ($searchCriteria['qsoresults'] != 'All') { + $limit = 'limit ' . $searchCriteria['qsoresults']; + } $where2 = ''; @@ -222,7 +226,7 @@ class Logbookadvanced_model extends CI_Model { } $sql = " - SELECT * + SELECT *, dxcc_entities.name AS station_country FROM " . $this->config->item('table_name') . " qsos INNER JOIN station_profile ON qsos.station_id=station_profile.station_id LEFT OUTER JOIN satellite ON qsos.COL_SAT_NAME = satellite.name @@ -237,12 +241,19 @@ class Logbookadvanced_model extends CI_Model { $where $where2 ORDER BY qsos.COL_TIME_ON desc, qsos.COL_PRIMARY_KEY desc - LIMIT $limit + $limit "; - $data = $this->db->query($sql, $binding); + return $this->db->query($sql, $binding); - $results = $data->result('array'); - return $results; + } + + public function getSearchResult($searchCriteria) { + return $this->searchDb($searchCriteria); + } + + public function getSearchResultArray($searchCriteria) { + $result = $this->searchDb($searchCriteria); + return $result->result('array'); } /* @@ -250,7 +261,7 @@ class Logbookadvanced_model extends CI_Model { * @return array */ public function searchQsos($searchCriteria) : array { - $results = $this->searchDb($searchCriteria); + $results = $this->getSearchResultArray($searchCriteria); $qsos = []; foreach ($results as $data) { diff --git a/application/views/activated_gridmap/index.php b/application/views/activated_gridmap/index.php index 1b9c28335..0c2da4145 100644 --- a/application/views/activated_gridmap/index.php +++ b/application/views/activated_gridmap/index.php @@ -1,4 +1,4 @@ -
+

@@ -96,7 +96,7 @@
-
+
diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index ba4b8c7b2..e9baf3c0b 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -1,21 +1,5 @@ - - -
+

@@ -40,7 +24,7 @@
-
+
:
diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 5dcab8ace..37bfab1e9 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -1,4 +1,4 @@ -
+

@@ -23,7 +23,7 @@
-
+
:
diff --git a/application/views/debug/index.php b/application/views/debug/index.php index 75aeae2b5..086ac8ae5 100644 --- a/application/views/debug/index.php +++ b/application/views/debug/index.php @@ -66,7 +66,15 @@ PHP Version - + + = 0) { + echo phpversion()." OK"; + } else { + echo phpversion()." Deprecated"; + } + ?> + @@ -587,4 +595,4 @@ var local_branch = 'n/a'; - \ No newline at end of file + diff --git a/application/views/gridmap/index.php b/application/views/gridmap/index.php index 93a292a94..d9c46718f 100644 --- a/application/views/gridmap/index.php +++ b/application/views/gridmap/index.php @@ -1,4 +1,4 @@ -
+

@@ -140,7 +140,7 @@
-
+
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php index 05351ed9c..efad26ebe 100644 --- a/application/views/logbookadvanced/index.php +++ b/application/views/logbookadvanced/index.php @@ -1,67 +1,67 @@ -
- session->flashdata('message')) { ?> - -
-

session->flashdata('message'); ?>

-
- -
+
+
+ session->flashdata('message')) { ?> + +
+

session->flashdata('message'); ?>

+
+ +
-
" - method="post"> + " method="post">
@@ -112,8 +112,7 @@ $options = json_decode($options);
- +
@@ -139,7 +138,7 @@ $options = json_decode($options);
- @@ -310,7 +309,7 @@ $options = json_decode($options);
- +
@@ -392,16 +391,16 @@ $options = json_decode($options);
- - - - - @@ -434,87 +433,88 @@ $options = json_decode($options); +
+
+ + + + + + datetime->show ?? "true") == "true") { + echo ''; + } ?> + de->show ?? "true") == "true") { + echo ''; + } ?> + dx->show ?? "true") == "true") { + echo ''; + } ?> + mode->show ?? "true") == "true") { + echo ''; + } ?> + rsts->show ?? "true") == "true") { + echo ''; + } ?> + rstr->show ?? "true") == "true") { + echo ''; + } ?> + band->show ?? "true") == "true") { + echo ''; + } ?> + myrefs->show ?? "true") == "true") { + echo ''; + } ?> + refs->show ?? "true") == "true") { + echo ''; + } ?> + name->show ?? "true") == "true") { + echo ''; + } ?> + qslvia->show ?? "true") == "true") { + echo ''; + } ?> + qsl->show ?? "true") == "true") { + echo ''; + } ?> + session->userdata('user_eqsl_name') != "" && ($options->eqsl->show ?? "true") == "true") { + echo ''; + } ?> + session->userdata('user_lotw_name') != "" && ($options->lotw->show ?? "true") == "true") { + echo ''; + } ?> + qslmsg->show ?? "true") == "true") { + echo ''; + } ?> + dxcc->show ?? "true") == "true") { + echo ''; + } ?> + state->show ?? "true") == "true") { + echo ''; + } ?> + cqzone->show ?? "true") == "true") { + echo ''; + } ?> + ituzone->show ?? "true") == "true") { + echo ''; + } ?> + iota->show ?? "true") == "true") { + echo ''; + } ?> + pota->show ?? "true") == "true") { + echo ''; + } ?> + operator->show ?? "true") == "true") { + echo ''; + } ?> + comment->show ?? "true") == "true") { + echo ''; + } ?> + + + + +
+
+
' . lang('general_word_datetime') . '' . lang('gen_hamradio_de') . '' . lang('gen_hamradio_dx') . '' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_rsts') . '' . lang('gen_hamradio_rstr') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_myrefs') . '' . lang('gen_hamradio_refs') . '' . lang('general_word_name') . '' . lang('gen_hamradio_qslvia') . '' . lang('gen_hamradio_qsl') . 'eQSLLoTW' . lang('gen_hamradio_qslmsg') . '' . lang('gen_hamradio_dxcc') . '' . lang('gen_hamradio_state') . '' . lang('gen_hamradio_cq_zone') . '' . lang('gen_hamradio_itu_zone') . '' . lang('gen_hamradio_iota') . '' . lang('gen_hamradio_pota') . '' . lang('gen_hamradio_operator') . '' . lang('general_word_comment') . '
-
- - - - - - datetime->show ?? "true") == "true") { - echo ''; - } ?> - de->show ?? "true") == "true") { - echo ''; - } ?> - dx->show ?? "true") == "true") { - echo ''; - } ?> - mode->show ?? "true") == "true") { - echo ''; - } ?> - rsts->show ?? "true") == "true") { - echo ''; - } ?> - rstr->show ?? "true") == "true") { - echo ''; - } ?> - band->show ?? "true") == "true") { - echo ''; - } ?> - myrefs->show ?? "true") == "true") { - echo ''; - } ?> - refs->show ?? "true") == "true") { - echo ''; - } ?> - name->show ?? "true") == "true") { - echo ''; - } ?> - qslvia->show ?? "true") == "true") { - echo ''; - } ?> - qsl->show ?? "true") == "true") { - echo ''; - } ?> - session->userdata('user_eqsl_name') != "" && ($options->eqsl->show ?? "true") == "true"){ - echo ''; - } ?> - session->userdata('user_lotw_name') != "" && ($options->lotw->show ?? "true") == "true"){ - echo ''; - } ?> - qslmsg->show ?? "true") == "true") { - echo ''; - } ?> - dxcc->show ?? "true") == "true") { - echo ''; - } ?> - state->show ?? "true") == "true") { - echo ''; - } ?> - cqzone->show ?? "true") == "true") { - echo ''; - } ?> - ituzone->show ?? "true") == "true") { - echo ''; - } ?> - iota->show ?? "true") == "true") { - echo ''; - } ?> - pota->show ?? "true") == "true") { - echo ''; - } ?> - operator->show ?? "true") == "true") { - echo ''; - } ?> - comment->show ?? "true") == "true") { - echo ''; - } ?> - - - - -
-
-
' . lang('general_word_datetime') . '' . lang('gen_hamradio_de') . '' . lang('gen_hamradio_dx') . '' . lang('gen_hamradio_mode') . '' . lang('gen_hamradio_rsts') . '' . lang('gen_hamradio_rstr') . '' . lang('gen_hamradio_band') . '' . lang('gen_hamradio_myrefs') . '' . lang('gen_hamradio_refs') . '' . lang('general_word_name') . '' . lang('gen_hamradio_qslvia') . '' . lang('gen_hamradio_qsl') . 'eQSLLoTW' . lang('gen_hamradio_qslmsg') . '' . lang('gen_hamradio_dxcc') . '' . lang('gen_hamradio_state') . '' . lang('gen_hamradio_cq_zone') . '' . lang('gen_hamradio_itu_zone') . '' . lang('gen_hamradio_iota') . '' . lang('gen_hamradio_pota') . '' . lang('gen_hamradio_operator') . '' . lang('general_word_comment') . '
-
+
\ No newline at end of file diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php index 3b37372db..d4a767cf0 100644 --- a/application/views/visitor/layout/footer.php +++ b/application/views/visitor/layout/footer.php @@ -59,6 +59,32 @@ + +