From d225acad87a576176e3e43e1c962c0e2a0e1a0f3 Mon Sep 17 00:00:00 2001
From: Peter Goodhall <magicbug@users.noreply.github.com>
Date: Tue, 4 Jul 2023 17:39:54 +0100
Subject: [PATCH 1/3] Merge pull request #2248 from iu2frl/dev

Fixed #2244
---
 docker/Dockerfile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f77d1400..bee0e909 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,14 +7,16 @@ RUN touch /usr/local/etc/php/conf.d/uploads.ini \
 && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/uploads.ini
 RUN apt-get update \
 && apt-get install -y git curl libxml2-dev libonig-dev
-RUN docker-php-ext-install mysqli
+RUN docker-php-ext-install mysqli mbstring xml
 #RUN docker-php-ext-install curl
-RUN docker-php-ext-install mbstring
-RUN docker-php-ext-install xml
 #RUN docker-php-ext-install openssl
-WORKDIR /var/www/html
+RUN rm -rf /var/www/html/docker/
 COPY ./ /var/www/html/
-RUN ls && rm -rf /var/www/html/docker/ \ 
+WORKDIR /var/www/html
+RUN cd /var/www/html \
+&& echo "Setting root as owner of the folder..." \
+&& chown -R root:root /var/www/html \
+&& echo "Setting permissions to the install folder" \
 && chown -R root:www-data ./application/config/ \
 && chown -R root:www-data ./application/logs/ \
 && chown -R root:www-data ./assets/qslcard/ \
@@ -30,4 +32,7 @@ RUN ls && rm -rf /var/www/html/docker/ \
 && chmod -R g+rw ./updates/ \
 && chmod -R g+rw ./uploads/ \
 && chmod -R g+rw ./images/eqsl_card_images/ \
-&& chmod -R g+rw ./assets/json/
+&& chmod -R g+rw ./assets/json/ \
+&& chmod 777 /var/www/html/install \
+&& echo "Make sure everything is fine" \
+&& dir -ls

From ba609e8002090615ac2ae9898bfc77f87c7d1a98 Mon Sep 17 00:00:00 2001
From: int2001 <int2001@users.noreply.github.com>
Date: Sat, 15 Jul 2023 13:14:42 +0000
Subject: [PATCH 2/3] Fixes #2295 // Populate station_callsign with chosen
 prifle-call when empty

---
 application/models/Logbook_model.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index c5f43dd5..63eb3a43 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -2749,9 +2749,13 @@ class Logbook_model extends CI_Model {
 	$station_profile=$CI->Stations->profile_clean($station_id);
 	$station_profile_call=$station_profile->station_callsign;
 
-/*	if (($station_id != 0) && ($record['station_callsign'] != $station_profile_call)) {	// Check if station_call from import matches profile ONLY when submitting via GUI.
+	if (($station_id !=0 ) && (!(isset($record['station_callsign'])))) {
+		$record['station_callsign']=$station_profile_call;
+	}
+
+	if (($station_id != 0) && ($record['station_callsign'] != $station_profile_call)) {	// Check if station_call from import matches profile ONLY when submitting via GUI.
 		return "Wrong station_callsign ".$record['station_callsign']." while importing QSO with ".$record['call']." for ".$station_profile_call;
-	} */
+	} 
 
         $CI =& get_instance();
         $CI->load->library('frequency');

From 11b44b798b92335ff122f8030fb40f6c47c87fcb Mon Sep 17 00:00:00 2001
From: int2001 <int2001@users.noreply.github.com>
Date: Sat, 15 Jul 2023 13:22:47 +0000
Subject: [PATCH 3/3] Added "Skipped" to errormsg

---
 application/models/Logbook_model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php
index 63eb3a43..cec2811f 100755
--- a/application/models/Logbook_model.php
+++ b/application/models/Logbook_model.php
@@ -2754,7 +2754,7 @@ class Logbook_model extends CI_Model {
 	}
 
 	if (($station_id != 0) && ($record['station_callsign'] != $station_profile_call)) {	// Check if station_call from import matches profile ONLY when submitting via GUI.
-		return "Wrong station_callsign ".$record['station_callsign']." while importing QSO with ".$record['call']." for ".$station_profile_call;
+		return "Wrong station_callsign ".$record['station_callsign']." while importing QSO with ".$record['call']." for ".$station_profile_call." : SKIPPED";
 	} 
 
         $CI =& get_instance();