diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2014-11-04 13:56:46 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2014-11-27 01:35:09 +0000 |
| commit | 1e597a6af1a6f1241bf51a6d406d7a2b21160d0d (patch) | |
| tree | cf9e2f6747fa3c2ff355e099f8c1335c14195ac7 | |
| parent | 4faf9c35c6134b248fc535084ae5f5eb2b85697d (diff) | |
| download | acf-kamailio-1e597a6af1a6f1241bf51a6d406d7a2b21160d0d.tar.bz2 acf-kamailio-1e597a6af1a6f1241bf51a6d406d7a2b21160d0d.tar.xz | |
Remove quotes from values in kamctlrc
(cherry picked from commit f9c547302d8adc55d3f5745f817caa7bb618ae4c)
Conflicts:
kamailio-model.lua
| -rw-r--r-- | kamailio-model.lua | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kamailio-model.lua b/kamailio-model.lua index 2bf56b2..7231c5d 100644 --- a/kamailio-model.lua +++ b/kamailio-model.lua @@ -28,6 +28,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 databaseconnect = function() if not dbkam then local engine @@ -53,7 +60,7 @@ local databaseconnect = function() end -- connect to data source - dbkam = db.create(engine, config.DBNAME or "openser", config.DBRWUSER or "openser", config.DBRWPW or "openserrw", config.DBHOST, config.DBPORT) + dbkam = db.create(engine, removequotes(config.DBNAME) or "openser", removequotes(config.DBRWUSER) or "openser", removequotes(config.DBRWPW) or "openserrw", removequotes(config.DBHOST), removequotes(config.DBPORT)) end return dbkam.databaseconnect() end @@ -203,7 +210,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 @@ -233,7 +240,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 |