util.dataforms: Fix including default value for list-single when given as field.value...

[prosody.git] / util / helpers.lua

diff --git a/util/helpers.lua b/util/helpers.lua
index ad23dd79572295c5bc7c727b65f489fc09c9a278..bf76d258d7237eaef4490f442bd490b69d2cafe9 100644 (file)
--- a/util/helpers.lua
+++ b/util/helpers.lua
@@ -1,20 +1,18 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 local debug = require "util.debug";
 
-module("helpers", package.seeall);
-
 -- Helper functions for debugging
 
 local log = require "util.logger".init("util.debug");
 
-function log_events(events, name, logger)
+local function log_events(events, name, logger)
        local f = events.fire_event;
        if not f then
                error("Object does not appear to be a util.events object");
@@ -29,38 +27,48 @@ function log_events(events, name, logger)
        return events;
 end
 
-function revert_log_events(events)
+local function revert_log_events(events)
        events.fire_event, events[events.fire_event] = events[events.fire_event], nil; -- :))
 end
 
-function show_events(events)
+local function log_host_events(host)
+       return log_events(prosody.hosts[host].events, host);
+end
+
+local function revert_log_host_events(host)
+       return revert_log_events(prosody.hosts[host].events);
+end
+
+local function show_events(events, specific_event)
        local event_handlers = events._handlers;
        local events_array = {};
        local event_handler_arrays = {};
        for event in pairs(events._event_map) do
                local handlers = event_handlers[event];
-               table.insert(events_array, event);
-               local handler_strings = {};
-               for i, handler in ipairs(handlers) do
-                       local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
-                       handler_strings[i] = "  "..i..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+               if handlers and (event == specific_event or not specific_event) then
+                       table.insert(events_array, event);
+                       local handler_strings = {};
+                       for i, handler in ipairs(handlers) do
+                               local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
+                               handler_strings[i] = "  "..i..": "..tostring(handler)..(upvals and ("\n        "..upvals) or "");
+                       end
+                       event_handler_arrays[event] = handler_strings;
                end
-               event_handler_arrays[event] = handler_strings;
        end
        table.sort(events_array);
        local i = 1;
-       repeat
+       while i <= #events_array do
                local handlers = event_handler_arrays[events_array[i]];
                for j=#handlers, 1, -1 do
                        table.insert(events_array, i+1, handlers[j]);
                end
                if i > 1 then events_array[i] = "\n"..events_array[i]; end
                i = i + #handlers + 1
-       until i == #events_array;
+       end
        return table.concat(events_array, "\n");
 end
 
-function get_upvalue(f, get_name)
+local function get_upvalue(f, get_name)
        local i, name, value = 0;
        repeat
                i = i + 1;
@@ -69,4 +77,11 @@ function get_upvalue(f, get_name)
        return value;
 end
 
-return _M;
+return {
+       log_host_events = log_host_events;
+       revert_log_host_events = revert_log_host_events;
+       log_events = log_events;
+       revert_log_events = revert_log_events;
+       show_events = show_events;
+       get_upvalue = get_upvalue;
+};