trunk
changeset 5076:88fb94df9b18
mod_admin_adhoc, mod_announce: Explicitly specify possible actions for ad-hoc commands
| author | Florian Zeitz <florob@babelmonkeys.de> |
|---|---|
| date | Thu, 02 Aug 2012 21:42:00 +0200 |
| parents | 4d939d2b1574 |
| children | 6c2c8bf36d22 |
| files | plugins/mod_admin_adhoc.lua plugins/mod_announce.lua |
| diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line diff
1.1 --- a/plugins/mod_admin_adhoc.lua Thu Aug 02 21:28:14 2012 +0200 1.2 +++ b/plugins/mod_admin_adhoc.lua Thu Aug 02 21:42:00 2012 +0200 1.3 @@ -75,7 +75,7 @@ 1.4 return { status = "completed", error = { message = "Invalid data.\nPassword mismatch, or empty username" } }; 1.5 end 1.6 else 1.7 - return { status = "executing", form = add_user_layout }, "executing"; 1.8 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = add_user_layout }, "executing"; 1.9 end 1.10 end 1.11 1.12 @@ -107,7 +107,7 @@ 1.13 return { status = "completed", error = { message = "User does not exist" } }; 1.14 end 1.15 else 1.16 - return { status = "executing", form = change_user_password_layout }, "executing"; 1.17 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = change_user_password_layout }, "executing"; 1.18 end 1.19 end 1.20 1.21 @@ -155,7 +155,7 @@ 1.22 (#failed ~= 0 and 1.23 "The following accounts could not be deleted:\n"..t_concat(failed, "\n") or "") }; 1.24 else 1.25 - return { status = "executing", form = delete_user_layout }, "executing"; 1.26 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = delete_user_layout }, "executing"; 1.27 end 1.28 end 1.29 1.30 @@ -205,7 +205,7 @@ 1.31 (#failed ~= 0 and 1.32 "The following accounts could not be disconnected:\n"..t_concat(failed, "\n") or "") }; 1.33 else 1.34 - return { status = "executing", form = end_user_session_layout }, "executing"; 1.35 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = end_user_session_layout }, "executing"; 1.36 end 1.37 end 1.38 1.39 @@ -254,7 +254,7 @@ 1.40 end 1.41 return { status = "completed", result = { layout = get_user_password_result_layout, values = {accountjid = accountjid, password = password} } }; 1.42 else 1.43 - return { status = "executing", form = get_user_password_layout }, "executing"; 1.44 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_user_password_layout }, "executing"; 1.45 end 1.46 end 1.47 1.48 @@ -312,7 +312,7 @@ 1.49 result:add_child(query); 1.50 return { status = "completed", other = result }; 1.51 else 1.52 - return { status = "executing", form = get_user_roster_layout }, "executing"; 1.53 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_user_roster_layout }, "executing"; 1.54 end 1.55 end 1.56 1.57 @@ -365,7 +365,7 @@ 1.58 return { status = "completed", result = {layout = get_user_stats_result_layout, values = {ipaddresses = IPs, rostersize = tostring(rostersize), 1.59 onlineresources = resources}} }; 1.60 else 1.61 - return { status = "executing", form = get_user_stats_layout }, "executing"; 1.62 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_user_stats_layout }, "executing"; 1.63 end 1.64 end 1.65 1.66 @@ -425,7 +425,7 @@ 1.67 end 1.68 return { status = "completed", result = {layout = get_online_users_result_layout, values = {onlineuserjids=t_concat(users, "\n")}} }; 1.69 else 1.70 - return { status = "executing", form = get_online_users_layout }, "executing"; 1.71 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = get_online_users_layout }, "executing"; 1.72 end 1.73 end 1.74 1.75 @@ -469,7 +469,7 @@ 1.76 '". Error was: "'..tostring(err or "<unspecified>")..'"' } }; 1.77 end 1.78 else 1.79 - return { status = "executing", form = layout }, "executing"; 1.80 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = layout }, "executing"; 1.81 end 1.82 end 1.83 1.84 @@ -503,7 +503,7 @@ 1.85 return { status = "completed", info = info }; 1.86 else 1.87 local modules = array.collect(keys(hosts[data.to].modules)):sort(); 1.88 - return { status = "executing", form = { layout = layout; values = { modules = modules } } }, "executing"; 1.89 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout; values = { modules = modules } } }, "executing"; 1.90 end 1.91 end 1.92 1.93 @@ -567,7 +567,7 @@ 1.94 1.95 return { status = "completed", info = "Server is about to shut down" }; 1.96 else 1.97 - return { status = "executing", form = shut_down_service_layout }, "executing"; 1.98 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = shut_down_service_layout }, "executing"; 1.99 end 1.100 end 1.101 1.102 @@ -601,7 +601,7 @@ 1.103 return { status = "completed", info = info }; 1.104 else 1.105 local modules = array.collect(keys(hosts[data.to].modules)):sort(); 1.106 - return { status = "executing", form = { layout = layout; values = { modules = modules } } }, "executing"; 1.107 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = { layout = layout; values = { modules = modules } } }, "executing"; 1.108 end 1.109 end 1.110
2.1 --- a/plugins/mod_announce.lua Thu Aug 02 21:28:14 2012 +0200 2.2 +++ b/plugins/mod_announce.lua Thu Aug 02 21:42:00 2012 +0200 2.3 @@ -88,7 +88,7 @@ 2.4 module:log("info", "Announcement sent to %d online users", count); 2.5 return { status = "completed", info = ("Announcement sent to %d online users"):format(count) }; 2.6 else 2.7 - return { status = "executing", form = announce_layout }, "executing"; 2.8 + return { status = "executing", actions = {"next", "complete", default = "complete"}, form = announce_layout }, "executing"; 2.9 end 2.10 2.11 return true;