Remove quotes from values in kamctlrc

1 files changed, 12 insertions, 5 deletions

diff --git a/kamailio-model.lua b/kamailio-model.lua
index dcc38e9..59aee83 100644
--- a/kamailio-model.lua
+++ b/kamailio-model.lua
@@ -29,6 +29,13 @@ local function assert (v, m)
 	return v, m
 end
 
+local removequotes = function(value)
+	if value and string.find(value, '^".*"$') then
+		return string.sub(value, 2, -2)
+	end
+	return value
+end
+
 local databasecreate = function()
 	if not dbkam then
 		local engine
@@ -63,7 +70,7 @@ local databasecreate = function()
 		end
 
 		-- connect to data source
-		dbkam = db.create(engine, config.DBNAME or "openser", config.DBRWUSER or "openser", config.DBRWPW or "openserrw", config.DBHOST or "127.0.0.1", config.DBPORT or port)
+		dbkam = db.create(engine, removequotes(config.DBNAME) or "openser", removequotes(config.DBRWUSER) or "openser", removequotes(config.DBRWPW) or "openserrw", removequotes(config.DBHOST) or "127.0.0.1", removequotes(config.DBPORT) or port)
 	end
 	return dbkam
 end
@@ -222,7 +229,7 @@ function mymodule.get_new_user()
 
 	-- get the default domain
 	config = config or format.parse_ini_file(fs.read_file(kamctlrc_file), "") or {}
-	user.domain.value = config.SIP_DOMAIN or ""
+	user.domain.value = removequotes(config.SIP_DOMAIN) or ""
 
 	return cfe({type="group", value=user, label="Kamailio User"})
 end
@@ -252,7 +259,7 @@ function mymodule.get_delete_user(self, clientdata)
 
 	-- get the default domain
 	config = config or format.parse_ini_file(fs.read_file(kamctlrc_file), "") or {}
-	user.domain.value = config.SIP_DOMAIN or ""
+	user.domain.value = removequotes(config.SIP_DOMAIN) or ""
 
 	return cfe({type="group", value=user, label="Delete User"})
 end
@@ -317,7 +324,7 @@ function mymodule.get_create_database(self, clientdata)
 	if dbkam and dbkam.engine == db.engine.mysql then
 		-- parse the kamctlrc file to determine the root user
 		config = config or format.parse_ini_file(fs.read_file(kamctlrc_file), "") or {}
-		local user = config.DBROOTUSER or "root"
+		local user = removequotes(config.DBROOTUSER) or "root"
 		
 		retval.value.password = cfe({ type="password", label="Password", seq=1 })
 		self.handle_clientdata(retval, clientdata)
@@ -328,7 +335,7 @@ function mymodule.get_create_database(self, clientdata)
 		local charset = string.match(out, "([^%s]+)%s*$") or ""
 		if string.find(charset, "utf8") or string.find(charset, "ucs2") then
 			retval.value.characterset = cfe({ type="select", label="Character Set", option={}, seq=2 })
-			out,err = modelfunctions.run_executable({"mysql", "-h", config.DBHOST, "-e", "show character set", "-u", user, "-p"..retval.value.password.value})
+			out,err = modelfunctions.run_executable({"mysql", "-h", dbkam.host, "-e", "show character set", "-u", user, "-p"..retval.value.password.value})
 			local charsets = format.string_to_table(out, "\n")
 			for i,c in ipairs(charsets) do
 				local label = string.match(c, "[^\t]*\t[^\t]*")