diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
commit | 15175bb828ab14cf0f35b221227beeeb46e4dd8f (patch) | |
tree | fe8c013599dd847f7365cb1adab80ab8fe846de5 /plugins/mod_admin_adhoc.lua | |
parent | a5efef5aab5624e3a1cb4f1966e719738b859eda (diff) | |
parent | 7cb22f77a78741a1bd085c6b3dc3b31f51c1fa09 (diff) | |
download | prosody-15175bb828ab14cf0f35b221227beeeb46e4dd8f.tar.gz prosody-15175bb828ab14cf0f35b221227beeeb46e4dd8f.zip |
Merge timber->trunk - thanks everyone!
Diffstat (limited to 'plugins/mod_admin_adhoc.lua')
-rw-r--r-- | plugins/mod_admin_adhoc.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua index d78c1aee..6f1357a9 100644 --- a/plugins/mod_admin_adhoc.lua +++ b/plugins/mod_admin_adhoc.lua @@ -10,7 +10,8 @@ local prosody = _G.prosody; local hosts = prosody.hosts; local t_concat = table.concat; -require "util.iterators"; +local iterators = require "util.iterators"; +local keys, values = iterators.keys, iterators.values; local usermanager_user_exists = require "core.usermanager".user_exists; local usermanager_create_user = require "core.usermanager".create_user; local usermanager_get_password = require "core.usermanager".get_password; @@ -23,6 +24,7 @@ local dataforms_new = require "util.dataforms".new; local array = require "util.array"; local modulemanager = require "modulemanager"; +module:depends"adhoc"; local adhoc_new = module:require "adhoc".new; function add_user_command_handler(self, data, state) |