Merge pull request wavelog#289 from wavelog/dev

Hotfix Release 1.5.2

Author: phl0

.dockerignore

@@ -0,0 +1,3 @@
+Dockerfile
+.git
+.github

.github/workflows/accessibility-alt-text-bot.yml

@@ -0,0 +1,37 @@
+name: Wavelog create Dockerimage and publish it
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+    - name: 'Login to GitHub Container Registry'
+      uses: docker/login-action@v1
+      with:
+       registry: ghcr.io
+       username: ${{github.actor}}
+       password: ${{secrets.GITHUB_TOKEN}}
+    - name: Docker meta
+      id: meta
+      uses: docker/metadata-action@v5
+      with:
+        images: ${{ env.REGISTRY_IMAGE }}
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Build and push
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        push: true
+        tags: ghcr.io/wavelog/wavelog:${{ github.ref_name == 'master' && 'latest' || github.ref_name }}

.github/workflows/docker-image.yml

@@ -0,0 +1,53 @@
+FROM php:8.3-apache
+RUN touch /usr/local/etc/php/conf.d/uploads.ini \
+&& echo "file_uploads = On" >> /usr/local/etc/php/conf.d/uploads.ini \
+&& echo "memory_limit = 256M" >> /usr/local/etc/php/conf.d/uploads.ini \
+&& echo "upload_max_filesize = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \
+&& echo "post_max_size = 64M" >> /usr/local/etc/php/conf.d/uploads.ini \
+&& echo "max_execution_time = 600" >> /usr/local/etc/php/conf.d/uploads.ini
+RUN apt-get update \
+&& apt-get install -y curl libxml2-dev libonig-dev libzip-dev cron \
+&& docker-php-ext-install mysqli mbstring xml zip
+RUN a2enmod rewrite
+ENV CI_ENV=docker
+
+COPY ./ /var/www/html/
+WORKDIR /var/www/html
+RUN chown -R www-data:www-data /var/www/html
+
+RUN mkdir ./userdata
+RUN mkdir ./application/config/docker
+RUN mv ./.htaccess.sample ./.htaccess
+RUN echo "Setting www-data as owner of the html folder" \
+&& chown -R www-data:www-data /var/www/html
+RUN echo "Setting permissions to the install folder" \
+&& cd /var/www/html \
+&& chmod -R g+rw ./application/config/ \
+&& chmod -R g+rw ./application/logs/ \
+&& chmod -R g+rw ./assets/qslcard/ \
+&& chmod -R g+rw ./backup/ \
+&& chmod -R g+rw ./updates/ \
+&& chmod -R g+rw ./uploads/ \
+&& chmod -R g+rw ./userdata/ \
+&& chmod -R g+rw ./images/eqsl_card_images/ \
+&& chmod -R g+rw ./assets/ \
+&& chmod -R g+rw ./application/config/docker/ \
+&& chmod -R 777 /var/www/html/install
+RUN echo "Installing cronjobs" \
+RUN touch /etc/crontab && \
+    echo "0 */12 * * * curl --silent http://localhost/clublog/upload &>/dev/null" >> /etc/crontab && \
+    echo "10 */12 * * * curl --silent http://localhost/eqsl/sync &>/dev/null" >> /etc/crontab && \
+    echo "20 */12 * * * curl --silent http://localhost/qrz/upload &>/dev/null" >> /etc/crontab && \
+    echo "30 */12 * * * curl --silent http://localhost/qrz/download &>/dev/null" >> /etc/crontab && \
+    echo "40 */12 * * * curl --silent http://localhost/hrdlog/upload &>/dev/null" >> /etc/crontab && \
+    echo "0 1 * * * curl --silent http://localhost/lotw/lotw_upload &>/dev/null" >> /etc/crontab && \
+    echo "10 1 * * * curl --silent http://localhost/update/lotw_users &>/dev/null" >> /etc/crontab && \
+    echo "20 1 * * 1 curl --silent http://localhost/update/update_clublog_scp &>/dev/null" >> /etc/crontab && \
+    echo "0 2 1 */1 * curl --silent http://localhost/update/update_sota &>/dev/null" >> /etc/crontab && \
+    echo "10 2 1 */1 * curl --silent http://localhost/update/update_wwff &>/dev/null" >> /etc/crontab && \
+    echo "20 2 1 */1 * curl --silent http://localhost/update/update_pota &>/dev/null" >> /etc/crontab && \
+    echo "0 3 1 */1 *  curl --silent http://localhost/update/update_dok &>/dev/null" >> /etc/crontab
+RUN chmod 0644 /etc/crontab
+RUN crontab </etc/crontab
+RUN mkdir -p /var/log/cron
+RUN sed -i 's/^exec /service cron start\n\nexec /' /usr/local/bin/apache2-foreground

Dockerfile

@@ -22,11 +22,15 @@ https://demo.wavelog.org
 
 
 ## Requirements
+### Recommended: Classic-LAMP-Stack:
 * Linux based Operating System (Windows stack may also work)
 * Apache (Nginx should work)
 * PHP Version 7.4 up to PHP 8.2 (PHP 8.3. in friendly Usertest)
 * MySQL or MariaDB (MySQL 5.7 or higher // MariaDB 10.1 or higher)
 
+### Experimental:
+* [Docker Support](https://github.com/wavelog/wavelog/wiki/Installation-via-Docker)
+
 Notes
 * If you want to log microwave QSOs you will need to use a 64bit operating system.
 * We do not provide Docker support, however you are free to use it if you wish but we will not handle support.

README.md

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

application/config/migration.php

@@ -364,6 +364,13 @@ function logbook_check_grid() {
 				$band = null;
 			}
 
+			// If $obj['cnfm'] exists
+			if(isset($obj['cnfm'])) {
+				$cnfm = $obj['cnfm'];
+			} else {
+				$cnfm = null;
+			}
+
 			$this->load->model('logbooks_model');
 
 			if($this->logbooks_model->public_slug_exists($logbook_slug)) {
@@ -388,15 +395,24 @@ function logbook_check_grid() {
 				// Search Logbook for callsign
 				$this->load->model('logbook_model');
 
-				$result = $this->logbook_model->check_if_grid_worked_in_logbook($grid, $logbooks_locations_array, $band);
-
+				$query = $this->logbook_model->check_if_grid_worked_in_logbook($grid, $logbooks_locations_array, $band, $cnfm);
 				http_response_code(201);
-				if($result > 0)
-				{
+				if ($query->num_rows() == 0) {
+					echo json_encode(['gridsquare' => strtoupper($grid), 'result' => 'Not Found']);
+				} else if ($cnfm == null) {
 					echo json_encode(['gridsquare' => strtoupper($grid), 'result' => 'Found']);
 				} else {
-					echo json_encode(['gridsquare' => strtoupper($grid), 'result' => 'Not Found']);
+					$arr = [];
+					foreach($query->result() as $line) {
+						$arr[] = $line->gridorcnfm;
+					}
+					if (in_array('Y', $arr)) {
+						echo json_encode(['gridsquare' => strtoupper($grid), 'result' => 'Confirmed']);
+					} else {
+						echo json_encode(['gridsquare' => strtoupper($grid), 'result' => 'Worked']);
+					}
 				}
+
 			} else {
 				// Logbook not found
 				http_response_code(404);

application/controllers/Api.php

@@ -84,11 +84,10 @@ function jsonentity($adif) {
         echo json_encode($return, JSON_PRETTY_PRINT);
     }
 
-	function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id = null) {
+	function json($tempcallsign, $tempband, $tempmode, $tempstation_id = null) {
 		session_write_close();
 		// Cleaning for security purposes
 		$callsign = $this->security->xss_clean($tempcallsign);
-		$type = $this->security->xss_clean($temptype);
 		$band = $this->security->xss_clean($tempband);
 		$mode = $this->security->xss_clean($tempmode);
 		$station_id = $this->security->xss_clean($tempstation_id);
@@ -134,7 +133,7 @@ function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id =
 
 		$lookupcall=$this->get_plaincall($callsign);
 
-		$return['partial'] = $this->partial($lookupcall);
+		$return['partial'] = $this->partial($lookupcall, $band);
 
 		$callbook = $this->logbook_model->loadCallBook($callsign, $this->config->item('use_fullname'));
 
@@ -152,8 +151,8 @@ function json($tempcallsign, $temptype, $tempband, $tempmode, $tempstation_id =
 		$return['qsl_manager'] 			= $this->nval($callbook['qslmgr'] ?? '', $this->logbook_model->call_qslvia($callsign));
 		$return['callsign_state'] 		= $this->nval($callbook['state'] ?? '', $this->logbook_model->call_state($callsign));
 		$return['callsign_us_county'] 	= $this->nval($callbook['us_county'] ?? '', $this->logbook_model->call_us_county($callsign));
-		$return['workedBefore'] 		= $this->worked_grid_before($return['callsign_qra'], $type, $band, $mode);
-		$return['confirmed'] 		= $this->confirmed_grid_before($return['callsign_qra'], $type, $band, $mode);
+		$return['workedBefore'] 		= $this->worked_grid_before($return['callsign_qra'], $band, $mode);
+		$return['confirmed'] 		= $this->confirmed_grid_before($return['callsign_qra'], $band, $mode);
 		$return['timesWorked'] 		= $this->logbook_model->times_worked($lookupcall);
 
 		if ($this->session->userdata('user_show_profile_image')) {
@@ -201,7 +200,7 @@ function nval($val1, $val2) {
 		return (($val2 ?? "") === "" ? ($val1 ?? "") : ($val2 ?? ""));
 	}
 
-	function confirmed_grid_before($gridsquare, $type, $band, $mode) {
+	function confirmed_grid_before($gridsquare, $band, $mode) {
 		if (strlen($gridsquare) < 4)
 			return false;
 
@@ -235,7 +234,7 @@ function confirmed_grid_before($gridsquare, $type, $band, $mode) {
 			}
 
 
-			if($type == "SAT") {
+			if($band == "SAT") {
 				$this->db->where('COL_PROP_MODE', 'SAT');
 				if ($extrawhere != '') {
 					$this->db->where('('.$extrawhere.')');
@@ -270,7 +269,7 @@ function confirmed_grid_before($gridsquare, $type, $band, $mode) {
 		return false;
 	}
 
-	function worked_grid_before($gridsquare, $type, $band, $mode)
+	function worked_grid_before($gridsquare, $band, $mode)
 	{
 		if (strlen($gridsquare) < 4)
 			return false;
@@ -279,7 +278,7 @@ function worked_grid_before($gridsquare, $type, $band, $mode)
 		$logbooks_locations_array = $this->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook'));
 
 		if(!empty($logbooks_locations_array)) {
-			if($type == "SAT") {
+			if($band == "SAT") {
 				$this->db->where('COL_PROP_MODE', 'SAT');
 			} else {
 				$this->db->where('COL_MODE', $this->logbook_model->get_main_mode_from_mode($mode));
@@ -625,7 +624,7 @@ function view($id) {
 		$this->load->view('interface_assets/footer');
 	}
 
-	function partial($id) {
+	function partial($id, $band = null) {
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
 
@@ -855,7 +854,7 @@ function partial($id) {
 					}
 					if (isset($data['callsign']['gridsquare'])) {
 						$this->load->model('logbook_model');
-						$callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
+						$callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'))->num_rows();
 					}
 					if (isset($callsign['callsign']['dxcc'])) {
 						$this->load->model('logbook_model');
@@ -879,7 +878,7 @@ function partial($id) {
 
 				if (isset($callsign['callsign']['gridsquare'])) {
 					$this->load->model('logbook_model');
-					$callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($callsign['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
+					$callsign['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($callsign['callsign']['gridsquare'],0,4)), 0, $band)->num_rows();
 				}
 				if (isset($callsign['callsign']['error'])) {
 					$callsign['error'] = $callsign['callsign']['error'];
@@ -935,7 +934,7 @@ function search_result($id="", $id2="") {
 
 						$data['callsign'] = $this->qrz->search($id, $this->session->userdata('qrz_session_key'), $this->config->item('use_fullname'));
 						if (isset($data['callsign']['gridsquare'])) {
-							$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
+							$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'))->num_rows();
 						}
 						if (isset($data['callsign']['dxcc'])) {
 							$entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);
@@ -962,7 +961,7 @@ function search_result($id="", $id2="") {
 							$data['callsign'] = $this->hamqth->search($id, $this->session->userdata('hamqth_session_key'));
 						}
 						if (isset($data['callsign']['gridsquare'])) {
-							$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'));
+							$data['grid_worked'] = $this->logbook_model->check_if_grid_worked_in_logbook(strtoupper(substr($data['callsign']['gridsquare'],0,4)), 0, $this->session->userdata('user_default_band'))->num_rows();
 						}
 						if (isset($data['callsign']['dxcc'])) {
 							$entity = $this->logbook_model->get_entity($data['callsign']['dxcc']);

application/controllers/Logbook.php

@@ -0,0 +1,36 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+        Tag Wavelog as Version 1.5.2
+*/
+
+class Migration_tag_1_5_2 extends CI_Migration {
+
+    public function up()
+    {
+
+        // Tag Wavelog New Version
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '1.5.2'));
+
+        // Trigger Version Info Dialog
+        $this->db->where('option_type', 'version_dialog');
+        $this->db->where('option_name', 'confirmed');
+        $this->db->update('user_options', array('option_value' => 'false'));
+
+        // Also set Version Dialog to "both" if only custom text is applied
+        $this->db->where('option_name', 'version_dialog');
+        $this->db->where('option_value', 'custom_text');
+        $this->db->update('options', array('option_value' => 'both'));
+
+
+    }
+
+    public function down()
+    {
+        $this->db->where('option_name', 'version');
+        $this->db->update('options', array('option_value' => '1.5.1'));
+    }
+}

application/migrations/194_tag_1_5_2.php

@@ -88,7 +88,7 @@ function get_dxcc_array($dxccArray, $bands, $postdata) {
 			if ($postdata['confirmed'] != NULL) {
 				$confirmedDXCC = $this->getDxccBandConfirmed($location_list, $band, $postdata);
 				foreach ($confirmedDXCC as $cdxcc) {
-               $dxccMatrix[$cdxcc->dxcc][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("'.str_replace("&", "%26", $cdxcc->name).'","'. $band . '","'. $postdata['sat'] . '","'. $postdata['orbit'] . '","' . $postdata['mode'] . '","DXCC","'.$qsl.'")\'>C</a></div>';
+					$dxccMatrix[$cdxcc->dxcc][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("'.str_replace("&", "%26", $cdxcc->name).'","'. $band . '","'. $postdata['sat'] . '","'. $postdata['orbit'] . '","' . $postdata['mode'] . '","DXCC","'.$qsl.'")\'>C</a></div>';
 				}
 			}
 		}
@@ -402,7 +402,7 @@ function getSummaryByBand($band, $postdata, $location_list) {
 
 		if ($band == 'SAT') {
 			$sql .= " and thcv.col_prop_mode ='" . $band . "'";
-			if ($band != 'All') {
+			if ($band != 'All' && $postdata['sat'] != 'All') {
 				$sql .= " and col_sat_name ='" . $postdata['sat'] . "'";
 			}
 		} else if ($band == 'All') {