From 63f7aed3605abed7df4fe30e7843093a3a500c2c Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 16 Nov 2021 14:23:39 +0100 Subject: [PATCH] TT#150950 sipwise_pushd: don't need to check dom preferences If there's a user preference set Change-Id: Ic7875afbe656540524a9462787d06aeffa65f382 (cherry picked from commit 6ae871f75c3aa5f5b9fa4d59629bed4c1b052fd6) --- plugins/mod_sipwise_pushd.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/mod_sipwise_pushd.lua b/plugins/mod_sipwise_pushd.lua index 4908ba2..60f9751 100644 --- a/plugins/mod_sipwise_pushd.lua +++ b/plugins/mod_sipwise_pushd.lua @@ -101,19 +101,23 @@ end local function push_enable(username, domain) reconect_check(); + local flag + for row in engine:select(push_usr_query, username, domain) do - module:log("debug", "usr pref %s", ut.table.tostring(row)) if row[2] == "never" then module:log("debug", "usr mobile_push_enable pref set to 'never'"); return false; end + module:log("debug", "usr pref %s", ut.table.tostring(row)) + flag = true end + if flag then return true end for row in engine:select(push_dom_query, domain) do - module:log("debug", "dom pref %s", ut.table.tostring(row)) if row[2] == "never" then module:log("debug", "domain mobile_push_enable pref set to 'never'"); return false; end + module:log("debug", "dom pref %s", ut.table.tostring(row)) end return true; end