comparison plugins/mod_admin_adhoc.lua @ 4797:e239668aa6d2

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Sun, 29 Apr 2012 02:10:55 +0100
parents 4b8f2b91826c
children 58714123f600
comparison
equal deleted inserted replaced
4796:04a34287dc12 4797:e239668aa6d2
8 8
9 local prosody = _G.prosody; 9 local prosody = _G.prosody;
10 local hosts = prosody.hosts; 10 local hosts = prosody.hosts;
11 local t_concat = table.concat; 11 local t_concat = table.concat;
12 12
13 require "util.iterators"; 13 local iterators = require "util.iterators";
14 local keys, values = iterators.keys, iterators.values;
14 local usermanager_user_exists = require "core.usermanager".user_exists; 15 local usermanager_user_exists = require "core.usermanager".user_exists;
15 local usermanager_create_user = require "core.usermanager".create_user; 16 local usermanager_create_user = require "core.usermanager".create_user;
16 local usermanager_get_password = require "core.usermanager".get_password; 17 local usermanager_get_password = require "core.usermanager".get_password;
17 local usermanager_set_password = require "core.usermanager".set_password; 18 local usermanager_set_password = require "core.usermanager".set_password;
18 local is_admin = require "core.usermanager".is_admin; 19 local is_admin = require "core.usermanager".is_admin;
21 local timer_add_task = require "util.timer".add_task; 22 local timer_add_task = require "util.timer".add_task;
22 local dataforms_new = require "util.dataforms".new; 23 local dataforms_new = require "util.dataforms".new;
23 local array = require "util.array"; 24 local array = require "util.array";
24 local modulemanager = require "modulemanager"; 25 local modulemanager = require "modulemanager";
25 26
27 module:depends("adhoc");
26 local adhoc_new = module:require "adhoc".new; 28 local adhoc_new = module:require "adhoc".new;
27 29
28 function add_user_command_handler(self, data, state) 30 function add_user_command_handler(self, data, state)
29 local add_user_layout = dataforms_new{ 31 local add_user_layout = dataforms_new{
30 title = "Adding a User"; 32 title = "Adding a User";