From 193882538eafe8f5b0b6ffb395925e9a3f4f162e Mon Sep 17 00:00:00 2001
From: int2001 <joerg@dj7nt.de>
Date: Thu, 29 Feb 2024 12:09:02 +0000
Subject: [PATCH] Fixed Bug with paper_types-templates

---
 application/migrations/185_harmonize_keys.php | 2 ++
 application/models/User_model.php             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/migrations/185_harmonize_keys.php b/application/migrations/185_harmonize_keys.php
index 1912f9328..88c60c040 100644
--- a/application/migrations/185_harmonize_keys.php
+++ b/application/migrations/185_harmonize_keys.php
@@ -18,6 +18,7 @@ class Migration_harmonize_keys extends CI_Migration {
 		$this->db->query("ALTER TABLE `notes` CHANGE COLUMN `user_id` `user_id` INT UNSIGNED NOT NULL;");
 		$this->db->query("ALTER TABLE `lotw_certs` CHANGE COLUMN `user_id` `user_id` INT UNSIGNED NOT NULL;");
 		$this->db->query("ALTER TABLE `label_types` CHANGE COLUMN `user_id` `user_id` INT UNSIGNED NOT NULL;");
+		$this->db->query("update `paper_types` set user_id=0 where user_id=-1;");	// Make user_id 0 as template for papers
 		$this->db->query("ALTER TABLE `paper_types` CHANGE COLUMN `user_id` `user_id` INT UNSIGNED NOT NULL;");
 		$this->db->query("ALTER TABLE `eQSL_images` CHANGE COLUMN `qso_id` `qso_id` BIGINT(20) UNSIGNED NOT NULL;");
 		$this->db->query("ALTER TABLE `contest_session` CHANGE COLUMN `station_id` `station_id` INT UNSIGNED NOT NULL;");
@@ -42,6 +43,7 @@ class Migration_harmonize_keys extends CI_Migration {
 		$this->db->query("ALTER TABLE `lotw_certs` CHANGE COLUMN `user_id` `user_id` INT NULL DEFAULT NULL;");
 		$this->db->query("ALTER TABLE `label_types` CHANGE COLUMN `user_id` `user_id` INT(5) NULL DEFAULT NULL;");
 		$this->db->query("ALTER TABLE `paper_types` CHANGE COLUMN `user_id` `user_id` INT(5) NULL DEFAULT NULL;");
+		$this->db->query("update `paper_types` set user_id=-1 where user_id=0;");
 		$this->db->query("ALTER TABLE `eQSL_images` CHANGE COLUMN `qso_id` `qso_id` VARCHAR(250) NOT NULL;");
 		$this->db->query("ALTER TABLE `contest_session` CHANGE COLUMN `station_id` `station_id` BIGINT(20) UNSIGNED NOT NULL;");
 		$this->db->query("ALTER TABLE `qsl_images` CHANGE COLUMN `qsoid` `qsoid` INT NULL;");
diff --git a/application/models/User_model.php b/application/models/User_model.php
index 3783f84a3..6dadb3586 100644
--- a/application/models/User_model.php
+++ b/application/models/User_model.php
@@ -201,7 +201,7 @@ class User_Model extends CI_Model {
 			$this->db->insert($this->config->item('auth_table'), $data);
 			$insert_id = $this->db->insert_id();
 			$this->db->query("insert into bandxuser (bandid, userid, active, cq, dok, dxcc, helvetia, iota, pota, sig, sota, uscounties, was, wwff, vucc, waja, rac) select bands.id, " . $insert_id . ", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 from bands;");
-			$this->db->query("insert into paper_types (user_id,paper_name,metric,width,orientation,height) SELECT ".$insert_id.", paper_name, metric, width, orientation,height FROM paper_types where user_id = -1;");
+			$this->db->query("insert into paper_types (user_id,paper_name,metric,width,orientation,height) SELECT ".$insert_id.", paper_name, metric, width, orientation,height FROM paper_types where user_id = 0;");	// Templates have user_id 0
 			return OK;
 		} else {
 			return EUSERNAMEEXISTS;