Comparison

plugins/mod_pubsub/pubsub.lib.lua @ 6473:7c8f58d2b331

Merge 0.9->0.10
author Matthew Wild <mwild1@gmail.com>
date Tue, 14 Oct 2014 10:59:27 +0100 (2014-10-14)
parent 6448:f799b45cf735
child 6841:be87ab2d611c
comparison
equal deleted inserted replaced
6470:67501b5576d3 6473:7c8f58d2b331
16 ["invalid-jid"] = { "modify", "bad-request", nil, "invalid-jid" }; 16 ["invalid-jid"] = { "modify", "bad-request", nil, "invalid-jid" };
17 ["jid-required"] = { "modify", "bad-request", nil, "jid-required" }; 17 ["jid-required"] = { "modify", "bad-request", nil, "jid-required" };
18 ["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" }; 18 ["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
19 ["item-not-found"] = { "cancel", "item-not-found" }; 19 ["item-not-found"] = { "cancel", "item-not-found" };
20 ["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" }; 20 ["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
21 ["forbidden"] = { "cancel", "forbidden" }; 21 ["forbidden"] = { "auth", "forbidden" };
22 ["not-allowed"] = { "cancel", "not-allowed" }; 22 ["not-allowed"] = { "cancel", "not-allowed" };
23 }; 23 };
24 local function pubsub_error_reply(stanza, error) 24 local function pubsub_error_reply(stanza, error)
25 local e = pubsub_errors[error]; 25 local e = pubsub_errors[error];
26 local reply = st.error_reply(stanza, unpack(e, 1, 3)); 26 local reply = st.error_reply(stanza, unpack(e, 1, 3));