From c36cbe27713c7c00ebffa663befb988cbab2f8cb Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Fri, 18 Nov 2016 20:37:16 +0300 Subject: [PATCH] Add. user parameters to build query for mod_directory. (#2091) --- .../scripts/directory/action/directory.lua | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua b/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua index 7ba1923aa3..66d58f5f98 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/directory.lua @@ -1,8 +1,15 @@ + --connect to the database local Database = require "resources.functions.database" local log = require "resources.functions.log"["directory_dir"] local dbh = Database.new('system') +--include json library + local json + if (debug["sql"]) then + json = require "resources.functions.lunajson" + end + --build the xml local xml = {} table.insert(xml, [[]]) @@ -14,13 +21,14 @@ sql = sql .. "where d.domain_uuid = e.domain_uuid and " sql = sql .. "(e.directory_visible = 'true' or e.directory_exten_visible='true') " if domain_name then - sql = sql .. "and d.domain_name = '"..domain_name.."' " + sql = sql .. "and d.domain_name = :domain_name" else sql = sql .. "order by d.domain_name" end + local sql_params = {domain_name = domain_name} if debug['sql'] then - log.noticef("SQL - %s", sql) + log.noticef("SQL: %s; params: %s", sql, json.encode(sql_params)) end -- export this params @@ -37,7 +45,7 @@ local prev_domain_name - dbh:query(sql, function(row) + dbh:query(sql, sql_params, function(row) if prev_domain_name ~= row.domain_name then if prev_domain_name then table.insert(xml, [[ ]])