Mercurial > prosody-hg
comparison plugins/mod_admin_adhoc.lua @ 6799:4fc6b0a090bb
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 26 Aug 2015 13:17:37 +0200 |
| parents | 87ec4e783ebd |
| children | 8fcee3339463 |
comparison
equal
deleted
inserted
replaced
| 6794:e3c51bf7861b | 6799:4fc6b0a090bb |
|---|---|
| 28 local array = require "util.array"; | 28 local array = require "util.array"; |
| 29 local modulemanager = require "core.modulemanager"; | 29 local modulemanager = require "core.modulemanager"; |
| 30 local core_post_stanza = prosody.core_post_stanza; | 30 local core_post_stanza = prosody.core_post_stanza; |
| 31 local adhoc_simple = require "util.adhoc".new_simple_form; | 31 local adhoc_simple = require "util.adhoc".new_simple_form; |
| 32 local adhoc_initial = require "util.adhoc".new_initial_data_form; | 32 local adhoc_initial = require "util.adhoc".new_initial_data_form; |
| 33 local set = require"util.set"; | |
| 33 | 34 |
| 34 module:depends("adhoc"); | 35 module:depends("adhoc"); |
| 35 local adhoc_new = module:require "adhoc".new; | 36 local adhoc_new = module:require "adhoc".new; |
| 36 | 37 |
| 37 local function generate_error_message(errors) | 38 local function generate_error_message(errors) |
| 611 (#err_list > 0 and ("Failed to reload the module "..fields.module.." on the hosts:\n"..t_concat(err_list, "\n")) or ""); | 612 (#err_list > 0 and ("Failed to reload the module "..fields.module.." on the hosts:\n"..t_concat(err_list, "\n")) or ""); |
| 612 return { status = "completed", info = info }; | 613 return { status = "completed", info = info }; |
| 613 end); | 614 end); |
| 614 | 615 |
| 615 local function send_to_online(message, server) | 616 local function send_to_online(message, server) |
| 617 local sessions; | |
| 616 if server then | 618 if server then |
| 617 sessions = { [server] = hosts[server] }; | 619 sessions = { [server] = hosts[server] }; |
| 618 else | 620 else |
| 619 sessions = hosts; | 621 sessions = hosts; |
| 620 end | 622 end |
