aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-07-26 04:33:17 +0200
committerKim Alvefur <zash@zash.se>2012-07-26 04:33:17 +0200
commit9114e88ee0cf86ca0ffe500e089389e54bb730ec (patch)
treead383c5a7b1d99bcaef9b8235b4746c304f3c569
parentd4e9884d66ab69c34c06bdfb9c2acda34dce2ec2 (diff)
downloadprosody-9114e88ee0cf86ca0ffe500e089389e54bb730ec.tar.gz
prosody-9114e88ee0cf86ca0ffe500e089389e54bb730ec.zip
mod_admin_adhoc, mod_admin_telnet, mod_bosh, mod_c2s, mod_component, mod_pep, mod_presence, mod_roster, mod_s2s: Import core_post_stanza from the global prosody table.
-rw-r--r--plugins/mod_admin_adhoc.lua1
-rw-r--r--plugins/mod_admin_telnet.lua1
-rw-r--r--plugins/mod_bosh.lua2
-rw-r--r--plugins/mod_c2s.lua1
-rw-r--r--plugins/mod_component.lua4
-rw-r--r--plugins/mod_pep.lua1
-rw-r--r--plugins/mod_presence.lua1
-rw-r--r--plugins/mod_roster.lua2
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
9 files changed, 10 insertions, 5 deletions
diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua
index 016eeb4a..50493abe 100644
--- a/plugins/mod_admin_adhoc.lua
+++ b/plugins/mod_admin_adhoc.lua
@@ -23,6 +23,7 @@ local timer_add_task = require "util.timer".add_task;
local dataforms_new = require "util.dataforms".new;
local array = require "util.array";
local modulemanager = require "modulemanager";
+local core_post_stanza = prosody.core_post_stanza;
module:depends("adhoc");
local adhoc_new = module:require "adhoc".new;
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 7b176d73..ca37ca7a 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -25,6 +25,7 @@ local cert_verify_identity = require "util.x509".verify_identity;
local commands = module:shared("commands")
local def_env = module:shared("env");
local default_env_mt = { __index = def_env };
+local core_post_stanza = prosody.core_post_stanza;
local function redirect_output(_G, session)
local env = setmetatable({ print = session.print }, { __index = function (t, k) return rawget(_G, k); end });
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 2ac6b4ed..f6e3095e 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -14,7 +14,7 @@ local sm = require "core.sessionmanager";
local sm_destroy_session = sm.destroy_session;
local new_uuid = require "util.uuid".generate;
local fire_event = prosody.events.fire_event;
-local core_process_stanza = core_process_stanza;
+local core_process_stanza = prosody.core_process_stanza;
local st = require "util.stanza";
local logger = require "util.logger";
local log = logger.init("mod_bosh");
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 1f62b4d4..2318ecad 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -28,6 +28,7 @@ local stream_close_timeout = module:get_option_number("c2s_close_timeout", 5);
local opt_keepalives = module:get_option_boolean("tcp_keepalives", false);
local sessions = module:shared("sessions");
+local core_process_stanza = prosody.core_process_stanza;
local stream_callbacks = { default_ns = "jabber:client", handlestanza = core_process_stanza };
local listener = {};
diff --git a/plugins/mod_component.lua b/plugins/mod_component.lua
index 4037ad28..751de59b 100644
--- a/plugins/mod_component.lua
+++ b/plugins/mod_component.lua
@@ -18,6 +18,8 @@ local jid_split = require "util.jid".split;
local new_xmpp_stream = require "util.xmppstream".new;
local uuid_gen = require "util.uuid".generate;
+local core_process_stanza = prosody.core_process_stanza;
+
local log = module._log;
@@ -169,8 +171,6 @@ function stream_callbacks.streamclosed(session)
session:close();
end
-local core_process_stanza = core_process_stanza;
-
function stream_callbacks.handlestanza(session, stanza)
-- Namespaces are icky.
if not stanza.attr.xmlns and stanza.name == "handshake" then
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index d6fe9a81..c2261e5f 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -17,6 +17,7 @@ local pairs, ipairs = pairs, ipairs;
local next = next;
local type = type;
local calculate_hash = require "util.caps".calculate_hash;
+local core_post_stanza = prosody.core_post_stanza;
local NULL = {};
local data = {};
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 3cac0973..dac86ae6 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -14,6 +14,7 @@ local t_concat, t_insert = table.concat, table.insert;
local s_find = string.find;
local tonumber = tonumber;
+local core_post_stanza = prosody.core_post_stanza;
local st = require "util.stanza";
local jid_split = require "util.jid".split;
local jid_bare = require "util.jid".bare;
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 96cc15f2..bfb2d927 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -18,7 +18,7 @@ local pairs, ipairs = pairs, ipairs;
local rm_remove_from_roster = require "core.rostermanager".remove_from_roster;
local rm_add_to_roster = require "core.rostermanager".add_to_roster;
local rm_roster_push = require "core.rostermanager".roster_push;
-local core_post_stanza = core_post_stanza;
+local core_post_stanza = prosody.core_post_stanza;
module:add_feature("jabber:iq:roster");
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 9f65f346..321ed0d7 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -10,7 +10,7 @@ module:set_global();
local prosody = prosody;
local hosts = prosody.hosts;
-local core_process_stanza = core_process_stanza;
+local core_process_stanza = prosody.core_process_stanza;
local tostring, type = tostring, type;
local t_insert = table.insert;