diff options
author | Ted Trask <ttrask01@yahoo.com> | 2016-06-15 15:52:43 +0000 |
---|---|---|
committer | Ted Trask <ttrask01@yahoo.com> | 2016-06-15 15:52:43 +0000 |
commit | c7edbb959cef3fd5f42edcd99d197133635a0498 (patch) | |
tree | 15f567a43081ea63aa2fe0e0dce66aafadf13034 | |
parent | 00b019262e15ba30f95994635bd84fb08a556222 (diff) | |
download | acf-freeswitch-vmail-c7edbb959cef3fd5f42edcd99d197133635a0498.tar.bz2 acf-freeswitch-vmail-c7edbb959cef3fd5f42edcd99d197133635a0498.tar.xz |
Fix listmessages HTML view to use new listusers format to determine forwarding destinations
-rw-r--r-- | vmail-listmessages-html.lsp | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/vmail-listmessages-html.lsp b/vmail-listmessages-html.lsp index ebf0fe4..a6307d2 100644 --- a/vmail-listmessages-html.lsp +++ b/vmail-listmessages-html.lsp @@ -7,15 +7,17 @@ html = require("acf.html") local useroptions = {{value="", label=""}} if viewlibrary.check_permission("listusers") and (viewlibrary.check_permission("forwardmessage") or viewlibrary.check_permission("forwardmymessage")) then local users = viewlibrary.dispatch_component("listusers", nil, true) - for i,v in ipairs(users.value) do - v.firstname = v.firstname or "" - v.lastname = v.lastname or "" - v.username = v.username or "" - end - table.sort(users.value, function(a,b) if a.firstname ~= b.firstname then return a.firstname < b.firstname elseif a.lastname ~= b.lastname then return a.lastname < b.lastname else return a.username < b.username end end) - for i,u in ipairs(users.value) do - if u.username ~= session.userinfo.userid then - useroptions[#useroptions+1] = {value=u.username, label=u.firstname..' '..u.lastname..' ('..u.username..')'} + if users.value and users.value.result then + for i,v in ipairs(users.value.result.value) do + v.firstname = v.firstname or "" + v.lastname = v.lastname or "" + v.username = v.username or "" + end + table.sort(users.value.result.value, function(a,b) if a.firstname ~= b.firstname then return a.firstname < b.firstname elseif a.lastname ~= b.lastname then return a.lastname < b.lastname else return a.username < b.username end end) + for i,u in ipairs(users.value.result.value) do + if u.username ~= session.userinfo.userid then + useroptions[#useroptions+1] = {value=u.username, label=u.firstname..' '..u.lastname..' ('..u.username..')'} + end end end end |