Dev Time for a Merge

README.md

@@ -7,7 +7,7 @@ Website: [http://www.cloudlog.co.uk](http://www.cloudlog.co.uk)
 ## Requirements
 * Linux based Operating System
 * Apache (Nginx should work)
-* PHP Version 7 (PHP 8.0 is working)
+* PHP Version 7.4 (PHP 8.0 is working, 8.1 might have some undetected issues, please report so we can fix)
 * MySQL (MySQL 5.7 or higher)
 
 Notes

application/controllers/Dashboard.php

@@ -8,11 +8,17 @@ public function index()
 		if(ENVIRONMENT == 'development') {
             $this->output->enable_profiler(TRUE);
         }
-
+
+		// Load language files
+		$this->lang->load('lotw');
+
 		// Database connections
 		$this->load->model('logbook_model');
 		$this->load->model('user_model');
 
+		// LotW infos
+		$this->load->model('LotwCert');
+
 		if($this->optionslib->get_option('version2_trigger') == "false") {
 			redirect('welcome');
 		}

application/controllers/Logbookadvanced.php

@@ -36,29 +36,14 @@ function index() {
 		ksort($deOptions);
 		$deOptions = array_keys($deOptions);
 
-		$modes = [];
-		if ($stationIds !== []) {
-			foreach ($this->logbookadvanced_model->get_worked_modes($stationIds) as $mode) {
-				$key = $mode['mode'];
-				if ($mode['submode'] !== null) {
-					$key .= "|" . $mode['submode'];
-				}
-				if ($mode['submode'] == null) {
-					$modes[$key] = $mode['mode'];
-				} else {
-					$modes[$key] = $mode['submode'];
-				}
-			}
-		}
-
 		$data = [];
 		$data['page_title'] = "Advanced logbook";
 		$data['hasDatePicker'] = true;
 
 		$pageData = [];
 		$pageData['datePlaceholder'] = 'DD/MM/YYYY';
 		$pageData['deOptions'] = $deOptions;
-		$pageData['modes'] = $modes;
+		$pageData['modes'] = $this->logbookadvanced_model->get_modes();
 		$pageData['dxccarray'] = $this->logbook_model->fetchDxcc();
 		$pageData['iotaarray'] = $this->logbook_model->fetchIota();
 

application/controllers/Lotw.php

@@ -513,7 +513,7 @@ private function loadFromFile($filepath, $display_view = "TRUE")
 				$status = $this->logbook_model->import_check($time_on, $record['call'], $record['band']);
 				$skipNewQso = $this->input->post('importMissing'); // If import missing was checked
 
-				if($status == "No Match" && $skipNewQso != NULL) {
+				if($status[0] == "No Match" && $skipNewQso != NULL) {
 
                     $station_id = $this->logbook_model->find_correct_station_id($record['station_callsign'], $record['my_gridsquare']);
 
@@ -545,7 +545,13 @@ private function loadFromFile($filepath, $display_view = "TRUE")
 						$iota = "";
 					}
 
-					$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $iota);
+					if (isset($record['cnty'])) {
+						$cnty = $record['cnty'];
+					} else {
+						$cnty = "";
+					}
+
+					$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $iota, $cnty);
 				}
 
 
@@ -559,7 +565,7 @@ private function loadFromFile($filepath, $display_view = "TRUE")
 					$table .= "<td>".$state."</td>";
 					$table .= "<td>".$qsl_gridsquare."</td>";
 					$table .= "<td>".$iota."</td>";
-					$table .= "<td>QSO Record: ".$status."</td>";
+					$table .= "<td>QSO Record: ".$status[0]."</td>";
 					$table .= "<td>LoTW Record: ".$lotw_status."</td>";
 				$table .= "</tr>";
 			}
@@ -910,7 +916,9 @@ function signlog($sign_key, $string) {
 
 
 		if(openssl_sign($qso_string, $signature, $pkeyid, OPENSSL_ALGO_SHA1)) {
-		  openssl_free_key($pkeyid);
+		  if (defined('PHP_MAJOR_VERSION') && PHP_MAJOR_VERSION < 8) {
+		    openssl_free_key($pkeyid);
+		  }
 		  $signature_b64 = base64_encode($signature);
 		  return $signature_b64;
 		}

application/controllers/Oqrs.php

@@ -9,6 +9,8 @@ class Oqrs extends CI_Controller {
 
 	function __construct() {
 		parent::__construct();
+		$this->lang->load('lotw');
+		$this->lang->load('eqsl');
 		// Commented out to get public access
 		// $this->load->model('user_model');
 		// if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
@@ -20,7 +22,7 @@ public function index() {
 		$data['stations'] = $this->oqrs_model->get_oqrs_stations();
 		$data['page_title'] = "Log Search & OQRS";
 
-		$this->load->view('interface_assets/header', $data);
+		$this->load->view('visitor/layout/header', $data);
 		$this->load->view('oqrs/index');
 		$this->load->view('interface_assets/footer');
     }
@@ -89,6 +91,7 @@ public function requests() {
 
 		$this->load->model('oqrs_model');
 		$data['result'] = $this->oqrs_model->getOqrsRequests($location_list);
+		$data['stations'] = $this->oqrs_model->get_oqrs_stations();
 
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('oqrs/showrequests');
@@ -157,11 +160,13 @@ public function alert_oqrs_request($postdata) {
 			}
 
 			$data['callsign'] = $this->security->xss_clean($postdata['callsign']);
+			$data['usermessage'] = $this->security->xss_clean($postdata['message']);
 
 			$message = $this->load->view('email/oqrs_request', $data,  TRUE);
 
 			$this->email->from('noreply@cloudlog.co.uk', 'Cloudlog');
 			$this->email->to($email);
+			$this->email->reply_to($this->security->xss_clean($postdata['email']), strtoupper($data['callsign']));
 
 			$this->email->subject('Cloudlog OQRS from ' . strtoupper($data['callsign']));
 			$this->email->message($message);
@@ -180,4 +185,21 @@ public function mark_oqrs_line_as_done() {
 
         $this->oqrs_model->mark_oqrs_line_as_done($id);
 	}
+
+	public function search() {
+		$this->load->model('oqrs_model');
+
+		$searchCriteria = array(
+			'user_id' => (int)$this->session->userdata('user_id'),
+			'de' => xss_clean($this->input->post('de')),
+			'dx' => xss_clean($this->input->post('dx')),
+			'status' => xss_clean($this->input->post('status')),
+			'oqrsResults' => xss_clean($this->input->post('oqrsResults')),
+		);
+
+		$qsos = $this->oqrs_model->searchOqrs($searchCriteria);
+
+		header("Content-Type: application/json");
+		print json_encode($qsos);
+	}
 }

application/controllers/Visitor.php

@@ -431,5 +431,15 @@ function js_array($array)
 		$this->load->view('gridsquares/index');
 		$this->load->view('visitor/layout/footer');
 	}
-
-}
+
+	public function oqrs_enabled($slug) {
+		$this->load->model('oqrs_model');
+		$this->load->model('Logbooks_model');
+		$logbook_id = $this->Logbooks_model->public_slug_exists_logbook_id($slug);
+		if (!empty($this->oqrs_model->getOqrsStationsFromSlug($logbook_id))) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}

application/controllers/Widgets.php

@@ -15,7 +15,11 @@ public function index()
 
 
 	// Can be used to embed last 11 QSOs in a iframe or javascript include.
-	public function qsos($logbook_slug) {
+	public function qsos($logbook_slug = null) {
+
+		if($logbook_slug == null) {
+			show_error('Unknown Public Page, please make sure the public slug is correct.');
+		}
 		$this->load->model('logbook_model');
 
 		$this->load->model('logbooks_model');

application/language/english/lotw_lang.php

@@ -18,10 +18,11 @@
 $lang['lotw_date_expires'] = 'Date Expires';
 $lang['lotw_qso_start_date'] = 'QSO Start Date';
 $lang['lotw_qso_end_date'] = 'QSO End Date';
-$lang['lotw_status'] = 'Status';
+$lang['lotw_status'] = 'Status / Last upload';
 $lang['lotw_options'] = 'Options';
 $lang['lotw_valid'] = 'Valid';
 $lang['lotw_expired'] = 'Expired';
+$lang['lotw_expiring'] = 'Expiring';
 $lang['lotw_not_synced'] = 'Not Synced';
 
 $lang['lotw_certificate_dxcc'] = 'Certificate DXCC';
@@ -52,3 +53,7 @@
 $lang['lotw_p12_export_step_four'] = 'Upload File below.';
 
 $lang['lotw_confirmed'] = 'This QSO is confirmed on LoTW';
+
+// LotW Expiry
+$lang['lotw_cert_expiring'] = 'At least one of your LotW certificates is about to expire!';
+$lang['lotw_cert_expired'] = 'At least one of your LotW certificates is expired!';

application/language/german/lotw_lang.php

@@ -18,10 +18,11 @@
 $lang['lotw_date_expires'] = 'Ablaufdatum';
 $lang['lotw_qso_start_date'] = 'QSO Startdatum';
 $lang['lotw_qso_end_date'] = 'QSO Enddatum';
-$lang['lotw_status'] = 'Status';
+$lang['lotw_status'] = 'Status / Letzter Upload';
 $lang['lotw_options'] = 'Optionen';
 $lang['lotw_valid'] = 'Gültig';
 $lang['lotw_expired'] = 'Abgelaufen';
+$lang['lotw_expiring'] = 'Läuft ab';
 $lang['lotw_not_synced'] = 'Nicht synchronisiert';
 
 $lang['lotw_certificate_dxcc'] = 'Zertifikats-DXCC';
@@ -52,3 +53,7 @@
 $lang['lotw_p12_export_step_four'] = 'Lade untenstehende Datei hoch.';
 
 $lang['lotw_confirmed'] = 'Dieses QSO wurde via LotW bestätigt am';
+
+// LotW Expiry
+$lang['lotw_cert_expiring'] = 'Mindestens eines deiner LotW Zertifikate läuft bald ab!';
+$lang['lotw_cert_expired'] = 'Mindestens eines deiner LotW Zertifikate ist abgelaufen!';

application/libraries/EqslImporter.php

@@ -154,7 +154,9 @@ public function import(): array {
 			}
 
 			$status = $this->CI->logbook_model->import_check($time_on, $record['call'], $record['band']);
-			if ($status == "Found") {
+			$qsoid = 0;
+			if ($status[0] == "Found") {
+				$qsoid = $status[1];
 				$dupe = $this->CI->logbook_model->eqsl_dupe_check($time_on, $record['call'], $record['band'], $config['eqsl_rcvd_mark']);
 				if ($dupe == false) {
 					$updated += 1;
@@ -173,8 +175,9 @@ public function import(): array {
 				'call' => str_replace("0", "Ø", $record['call']),
 				'mode' => $record['mode'],
 				'submode' => $record['submode'] ?? null,
-				'status' => $status,
+				'status' => $status[0],
 				'eqsl_status' => $eqsl_status,
+				'qsoid' => $qsoid,
 			);
 		}
 

application/libraries/Qra.php

@@ -165,7 +165,7 @@ function bearing($lat1, $lon1, $lat2, $lon2, $unit = 'M') {
 }
 
 function get_bearing($lat1, $lon1, $lat2, $lon2) {
-	return (rad2deg(atan2(sin(deg2rad($lon2) - deg2rad($lon1)) * cos(deg2rad($lat2)), cos(deg2rad($lat1)) * sin(deg2rad($lat2)) - sin(deg2rad($lat1)) * cos(deg2rad($lat2)) * cos(deg2rad($lon2) - deg2rad($lon1)))) + 360) % 360;
+	return (int)(rad2deg(atan2(sin(deg2rad($lon2) - deg2rad($lon1)) * cos(deg2rad($lat2)), cos(deg2rad($lat1)) * sin(deg2rad($lat2)) - sin(deg2rad($lat1)) * cos(deg2rad($lat2)) * cos(deg2rad($lon2) - deg2rad($lon1)))) + 360) % 360;
 }
 
 function qra2latlong($strQRA) {

application/models/Adif_data.php

@@ -82,12 +82,12 @@ function export_custom($from, $to, $station_id, $exportLotw = false) {
         $this->db->where($this->config->item('table_name').'.station_id', $station_id);
 
         // If date is set, we format the date and add it to the where-statement
-        if ($from != 0) {
+        if ($from) {
             $from = DateTime::createFromFormat('d/m/Y', $from);
             $from = $from->format('Y-m-d');
             $this->db->where("date(".$this->config->item('table_name').".COL_TIME_ON) >= '".$from."'");
         }
-        if ($to != 0) {
+        if ($to) {
             $to = DateTime::createFromFormat('d/m/Y', $to);
             $to = $to->format('Y-m-d');
             $this->db->where("date(".$this->config->item('table_name').".COL_TIME_ON) <= '".$to."'");

application/models/Distances_model.php

@@ -171,7 +171,7 @@ function plot($qsoArray, $gridsquare, $measurement_base) {
             foreach ($qsoArray as $qso) {
                 $qrb['Qsos']++;                                                        // Counts up number of qsos
                 $bearingdistance = $this->bearing_dist($stationgrid, $qso['grid'], $measurement_base);     // Calculates distance based on grids
-                $arrayplacement = $bearingdistance / 50;                                // Resolution is 50, calculates where to put result in array
+                $arrayplacement = (int)($bearingdistance / 50);                                // Resolution is 50, calculates where to put result in array
                 if ($bearingdistance > $qrb['Distance']) {                              // Saves the longest QSO
                     $qrb['Distance'] = $bearingdistance;
                     $qrb['Callsign'] = $qso['callsign'];