From 32d1b9eb7bc6fa4f492648c736c8f5b3828c2149 Mon Sep 17 00:00:00 2001
From: aceberg <1502200+aceberg@users.noreply.github.com>
Date: Fri, 26 Aug 2022 13:26:43 +0700
Subject: [PATCH] Fix: Issue #5

---
 .github/workflows/docker-publish.yml | 2 +-
 src/db-connect.go                    | 1 +
 src/db-edit.go                       | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 4bb1e06..ca732c1 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   IMAGE_NAME: watchyourlan
-  TAGS: latest, v0.7
+  TAGS: latest, v0.7.1
 
 
 jobs:
diff --git a/src/db-connect.go b/src/db-connect.go
index 0807046..78c2c6b 100644
--- a/src/db-connect.go
+++ b/src/db-connect.go
@@ -36,6 +36,7 @@ func db_select() (dbHosts []Host) {
 			log.Fatal(err)
     	}
 		oneHost.Name = unquote_str(oneHost.Name)
+		oneHost.Hw = unquote_str(oneHost.Hw)
     	dbHosts = append(dbHosts, oneHost)
   	}
 
diff --git a/src/db-edit.go b/src/db-edit.go
index 20b41fa..b7f811e 100644
--- a/src/db-edit.go
+++ b/src/db-edit.go
@@ -26,19 +26,23 @@ func db_create() {
 }
 
 func db_insert(oneHost Host) {
+	oneHost.Name = quote_str(oneHost.Name)
+	oneHost.Hw = quote_str(oneHost.Hw)
 	sqlStatement := `INSERT INTO "now" (NAME, IP, MAC, HW, DATE, KNOWN, NOW) 
 		VALUES ('%s','%s','%s','%s','%s','%d','%d');`
-  	sqlStatement = fmt.Sprintf(sqlStatement, quote_str(oneHost.Name), oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now)
+  	sqlStatement = fmt.Sprintf(sqlStatement, oneHost.Name, oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now)
 	//fmt.Println("Insert statement:", sqlStatement)
     db_exec(sqlStatement)
 }
 
 func db_update(oneHost Host) {
+	oneHost.Name = quote_str(oneHost.Name)
+	oneHost.Hw = quote_str(oneHost.Hw)
 	sqlStatement := `UPDATE "now" set 
 		NAME = '%s', IP = '%s', MAC = '%s', HW = '%s', DATE = '%s', 
 		KNOWN = '%d', NOW = '%d' 
 		WHERE ID = '%d';`
-  	sqlStatement = fmt.Sprintf(sqlStatement, quote_str(oneHost.Name), oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now, oneHost.Id)
+  	sqlStatement = fmt.Sprintf(sqlStatement, oneHost.Name, oneHost.Ip, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now, oneHost.Id)
 	//fmt.Println("Update statement:", sqlStatement)
     db_exec(sqlStatement)
 }