mod_bosh: Store time to destroy session in inactive_sessions, removing dependency...

[prosody.git] / plugins / mod_admin_adhoc.lua

diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index 984ae5ea5c266bc7af57c4aff2606dfbe447e0ef..d78c1aeec0e14bc23c41812a01c0ebd0ddf0778f 100644 (file)
--- a/plugins/mod_admin_adhoc.lua
+++ b/plugins/mod_admin_adhoc.lua
@@ -1,4 +1,4 @@
--- Copyright (C) 2009-2010 Florian Zeitz
+-- Copyright (C) 2009-2011 Florian Zeitz
 --
 -- This file is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -101,6 +101,16 @@ function change_user_password_command_handler(self, data, state)
        end
 end
 
+function config_reload_handler(self, data, state)
+       local ok, err = prosody.reload_config();
+       if ok then
+               return { status = "completed", info = "Configuration reloaded (modules may need to be reloaded for this to have an effect)" };
+       else
+               return { status = "completed", error = { message = "Failed to reload config: " .. tostring(err) } };
+       end
+end
+
+
 function delete_user_command_handler(self, data, state)
        local delete_user_layout = dataforms_new{
                title = "Deleting a User";
@@ -540,8 +550,6 @@ function shut_down_service_handler(self, data, state)
        else
                return { status = "executing", form = shut_down_service_layout }, "executing";
        end
-
-       return true;
 end
 
 function unload_modules_handler(self, data, state)
@@ -582,6 +590,7 @@ end
 
 local add_user_desc = adhoc_new("Add User", "http://jabber.org/protocol/admin#add-user", add_user_command_handler, "admin");
 local change_user_password_desc = adhoc_new("Change User Password", "http://jabber.org/protocol/admin#change-user-password", change_user_password_command_handler, "admin");
+local config_reload_desc = adhoc_new("Reload configuration", "http://prosody.im/protocol/config#reload", config_reload_handler, "global_admin");
 local delete_user_desc = adhoc_new("Delete User", "http://jabber.org/protocol/admin#delete-user", delete_user_command_handler, "admin");
 local end_user_session_desc = adhoc_new("End User Session", "http://jabber.org/protocol/admin#end-user-session", end_user_session_handler, "admin");
 local get_user_password_desc = adhoc_new("Get User Password", "http://jabber.org/protocol/admin#get-user-password", get_user_password_handler, "admin");
@@ -591,11 +600,12 @@ local get_online_users_desc = adhoc_new("Get List of Online Users", "http://jabb
 local list_modules_desc = adhoc_new("List loaded modules", "http://prosody.im/protocol/modules#list", list_modules_handler, "admin");
 local load_module_desc = adhoc_new("Load module", "http://prosody.im/protocol/modules#load", load_module_handler, "admin");
 local reload_modules_desc = adhoc_new("Reload modules", "http://prosody.im/protocol/modules#reload", reload_modules_handler, "admin");
-local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "admin");
+local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "global_admin");
 local unload_modules_desc = adhoc_new("Unload modules", "http://prosody.im/protocol/modules#unload", unload_modules_handler, "admin");
 
 module:add_item("adhoc", add_user_desc);
 module:add_item("adhoc", change_user_password_desc);
+module:add_item("adhoc", config_reload_desc);
 module:add_item("adhoc", delete_user_desc);
 module:add_item("adhoc", end_user_session_desc);
 module:add_item("adhoc", get_user_password_desc);