Merge pull request wavelog#208 from HB9HIL/unique

eQSL bug fix

Author: HB9HIL

application/config/migration.php

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

application/controllers/Eqsl.php

@@ -616,8 +616,10 @@ function bulk_download_image($id) {
 				return $error;
 			}
 			$filename = uniqid().'.jpg';
-			if (file_put_contents($this->Eqsl_images->get_imagePath('p') .'/'. $filename, $content) !== false) {
-				$this->Eqsl_images->save_image($id, $filename);
+			if($this->Eqsl_images->get_image($id) == "No Image") {
+				if (file_put_contents($this->Eqsl_images->get_imagePath('p') .'/'. $filename, $content) !== false) {
+					$this->Eqsl_images->save_image($id, $filename);
+				}
 			}
 		}
 		return $error;

application/migrations/186_rm_eqsl_dbl.php

@@ -0,0 +1,111 @@
+<?php
+
+defined('BASEPATH') or exit('No direct script access allowed');
+
+// Remove Dupes from eQSL-Table and add a unique idx
+
+class Migration_rm_eqsl_dbl extends CI_Migration
+{
+
+	public function up()
+	{
+		$dbltrbl = 1;
+		while ($dbltrbl>0) {
+		$sql = 'SELECT MIN(id) as id,qso_id FROM eQSL_images GROUP BY qso_id HAVING count(1)>1;';
+		$query = $this->db->query($sql);
+		$dbltrbl = $query->num_rows();
+
+		if ($dbltrbl > 0) {
+			$eqsl2del = [];
+
+			foreach ($query->result() as $row)
+				$eqsl2del[] = $row->id;
+
+			foreach ($eqsl2del as $oneeqsl) {
+				$res = $this->db->query("SELECT image_file FROM eQSL_images WHERE id=?", $oneeqsl)->result()[0]->image_file;
+
+				if ($this->config->item('userdata')) {
+
+					$userdata_dir = $this->config->item('userdata');
+					$qso_id = $this->get_qsoid_from_eqsl_filename($res) ?? '';
+
+					// we need to get the user ID which corresponds to that particular qso
+					if (!empty($qso_id)) {
+						$get_user_id = $this->get_user_id_from_qso($qso_id);
+
+						// can be an deleted qso
+						if (!empty($get_user_id)) {
+							$user_id = $get_user_id;
+						} else {
+							$user_id = 'not_assigned';
+						}
+					} else {
+						$user_id = 'not_assigned';
+					}
+
+					// target path with userdata dir
+					$target_path = $userdata_dir . '/' . $user_id . '/eqsl_card';
+
+					// then remove the file
+					if (!unlink($target_path . '/' . $res)) {
+						log_message('error', "Mig 186: File: '" . $target_path . "/" . $res . "' could not be deleted. There is no file with this filename. This shouldn't be a problem.");
+					} else {
+						log_message('debug', "Mig 186: File: '" . $target_path . "/" . $res . "' was deleted because it was a dupe.");
+					}
+				} else {
+					// if 'userdata' is disabled we can use the old paths
+					if (!unlink('images/eqsl_card_images/' . $res)) {
+						log_message('error', "Mig 186: File: 'images/eqsl_card_images/" . $res . "' could not be deleted. There is no file with this filename. This shouldn't be a problem.");
+					} else {
+						log_message('debug', "Mig 186: File: 'images/eqsl_card_images/" . $res . "' was deleted because it was a dupe.");
+					}
+				}
+			}
+			foreach ($eqsl2del as $oneeqsl) {
+				$this->db->query('delete from eQSL_images where id=?',$oneeqsl);
+			}
+		}
+		}
+		
+		$index = $this->db->query("SHOW INDEX FROM eQSL_images WHERE Key_name = 'qso_id_UNIQUE'")->num_rows();
+		if ($index == 0) {
+			$this->db->query("ALTER TABLE `eQSL_images` ADD UNIQUE INDEX `qso_id_UNIQUE` (`qso_id` ASC);");
+		}
+		
+	}
+
+	public function down()
+	{
+		$index = $this->db->query("SHOW INDEX FROM eQSL_images WHERE Key_name = 'qso_id_UNIQUE'")->num_rows();
+		if ($index > 0) {
+			$this->db->query("ALTER TABLE `eQSL_images` DROP INDEX `qso_id_UNIQUE`;");
+		}
+	}
+
+	function get_qsoid_from_eqsl_filename($filename)
+	{
+
+		$sql = "SELECT qso_id FROM eQSL_images WHERE image_file = ?";
+
+		$result = $this->db->query($sql, $filename);
+
+		$row = $result->row();
+		return $row->qso_id;
+	}
+
+	function get_user_id_from_qso($qso_id)
+	{
+
+		$clean_qsoid = $this->security->xss_clean($qso_id);
+
+		$sql =    'SELECT station_profile.user_id
+				  FROM ' . $this->config->item('table_name') . ' 
+				  INNER JOIN station_profile ON (' . $this->config->item('table_name') . '.station_id = station_profile.station_id)
+				  WHERE ' . $this->config->item('table_name') . '.COL_PRIMARY_KEY = ?';
+
+		$result = $this->db->query($sql, $clean_qsoid);
+		$row = $result->row();
+
+		return $row->user_id;
+	}
+}

application/models/Logbook_model.php

@@ -1678,7 +1678,8 @@ function get_qso($id, $trusted = false) {
 		  $this->db->join('lotw_users', $this->config->item('table_name').'.COL_CALL = lotw_users.callsign', 'left outer');
 		  $this->db->join('primary_subdivisions', $this->config->item('table_name').'.COL_DXCC = primary_subdivisions.adif AND '.$this->config->item('table_name').'.COL_STATE = primary_subdivisions.state', 'left outer');
 		  $this->db->where('COL_PRIMARY_KEY', $id);
-
+      $this->db->limit(1);
+      
 		  return $this->db->get();
 	  } else {
 		  return;