Merge pull request wavelog#251 from wavelog/dev

Release 1.4

Author: HB9HIL

.gitignore

@@ -2,6 +2,7 @@
 /application/config/config.php
 /application/logs/*.php
 /application/cache/*
+/uploads
 /uploads/*.adi
 /uploads/*.ADI
 /uploads/*.tq8

application/config/migration.php

@@ -22,7 +22,7 @@
 |
 */
 
-$config['migration_version'] = 188;
+$config['migration_version'] = 191;
 
 /*
 |--------------------------------------------------------------------------

application/controllers/Adif.php

@@ -139,6 +139,9 @@ public function export_lotw()
 	}
 
 	public function index() {
+		$this->load->model('contesting_model');
+		$data['contests']=$this->contesting_model->getActivecontests();
+
 		$this->load->model('stations');
 
 		$data['page_title'] = "ADIF Import / Export";
@@ -183,6 +186,7 @@ public function import() {
 			$this->load->view('interface_assets/footer');
 		} else {
 			if ($this->stations->check_station_is_accessible($this->input->post('station_profile'))) {
+				$contest=$this->security->xss_clean($this->input->post('contest')) ?? '';
 				$stopnow=false;
 				$fdata = array('upload_data' => $this->upload->data());
 				ini_set('memory_limit', '-1');
@@ -222,6 +226,9 @@ public function import() {
 					$alladif=[];
 					while($record = $this->adif_parser->get_record())
 					{
+						if ($contest != '') {
+							$record['contest_id']=$contest;
+						}
 						if(count($record) == 0) {
 							break;
 						};

application/controllers/Awards.php

@@ -373,10 +373,12 @@ public function qso_details_ajax(){
 		$searchphrase = str_replace('"', "", $this->security->xss_clean($this->input->post("Searchphrase")));
 		$band = str_replace('"', "", $this->security->xss_clean($this->input->post("Band")));
 		$mode = str_replace('"', "", $this->security->xss_clean($this->input->post("Mode")));
+		$sat = str_replace('"', "", $this->security->xss_clean($this->input->post("Sat")));
+		$orbit = str_replace('"', "", $this->security->xss_clean($this->input->post("Orbit")));
 		$type = $this->security->xss_clean($this->input->post('Type'));
 		$qsl = $this->input->post('QSL') == null ? '' : $this->security->xss_clean($this->input->post('QSL'));
 		$searchmode = $this->input->post('searchmode') == null ? '' : $this->security->xss_clean($this->input->post('searchmode'));
-		$data['results'] = $this->logbook_model->qso_details($searchphrase, $band, $mode, $type, $qsl, $searchmode);
+		$data['results'] = $this->logbook_model->qso_details($searchphrase, $band, $mode, $type, $qsl, $sat, $orbit, $searchmode);
 
 		// This is done because we have two different ways to get dxcc info in Wavelog. Once is using the name (in awards), and the other one is using the ADIF DXCC.
 		// We replace the values to make it look a bit nicer
@@ -402,7 +404,18 @@ public function qso_details_ajax(){
 
 		// Render Page
 		$data['page_title'] = "Log View - " . $type;
-		$data['filter'] = $type . " " . $searchphrase . " and band ".$band . " and mode ".$mode;
+		$data['filter'] = $type." ".$searchphrase." and band ".$band;
+		if ($band == 'SAT') {
+			if ($sat != 'All' && $sat != null) {
+				$data['filter'] .= " and sat ".$sat;
+			}
+			if ($orbit != 'All' && $orbit != null) {
+				$data['filter'] .= " and orbit type ".$orbit;
+			}
+		}
+		if ($mode != null && strtolower($mode) != 'all') {
+			$data['filter'] .= " and mode ".$mode;
+		}
 		if (!empty($qsltype)) {
 			$data['filter'] .= " and ".implode('/', $qsltype);
 		}

application/controllers/Bandmap.php

@@ -44,14 +44,13 @@ function list() {
 			'assets/js/sections/bandmap_list.js'
 		];
 
-		$CI =& get_instance();
 		// Get Date format
-		if($CI->session->userdata('user_date_format')) {
+		if($this->session->userdata('user_date_format')) {
 			// If Logged in and session exists
-			$pageData['custom_date_format'] = $CI->session->userdata('user_date_format');
+			$pageData['custom_date_format'] = $this->session->userdata('user_date_format');
 		} else {
 			// Get Default date format from /config/wavelog.php
-			$pageData['custom_date_format'] = $CI->config->item('qso_date_format');
+			$pageData['custom_date_format'] = $this->config->item('qso_date_format');
 		}
 
 		switch ($pageData['custom_date_format']) {