X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_vcard.lua;h=26b30e3ab3c10621e9f8fa47a9eb05a4cca8413b;hb=a9cf545e96d8e66001ce702beb12c61403736096;hp=356b9836070b19d8009b4753a6e00b7e2c47e278;hpb=accee38e2cb7a962e968d3cf03cb4ab33015af60;p=prosody.git

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index 356b9836..26b30e3a 100644
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -1,54 +1,54 @@
-
-require "util.datamanager"
-local datamanager = datamanager;
+-- 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 st = require "util.stanza"
-local send = require "core.sessionmanager".send_to_session
-local t_concat, t_insert = table.concat, table.insert;
+local jid_split = require "util.jid".split;
+
+local vcards = module:open_store();
 
-require "util.jid"
-local jid_split = jid.split;
+module:add_feature("vcard-temp");
 
-add_iq_handler("c2s", "vcard-temp", 
-		function (session, stanza)
-			if stanza.tags[1].name == "vCard" then
-				local to = stanza.attr.to;
-				if stanza.attr.type == "get" then
-					local vCard;
-					if to then
-						local node, host = jid_split(to);
-						if hosts[host] and hosts[host].type == "local" then
-							vCard = datamanager.load(node, host, "vCard"); -- load vCard for user or server
-						end
-					else
-						vCard = datamanager.load(session.username, session.host, "vCard");-- load user's own vCard
-					end
-					if vCard then
-						local iq = st.reply(stanza);
-						iq:add_child(vCard);
-						send(session, iq); -- send vCard!
-					else
-						send(session, st.error_reply(stanza, "cancel", "item-not-found"));
-					end
-				elseif stanza.attr.type == "set" then
-					if not to or to == session.username.."@"..session.host then
-						if datamanager.store(session.username, session.host, "vCard", stanza.tags[1]) then
-							send(session, st.reply(stanza));
-						else
-							-- TODO unable to write file, file may be locked, etc, what's the correct error?
-							send(session, st.error_reply(stanza, "wait", "internal-server-error"));
-						end
-					else
-						send(session, st.error_reply(stanza, "auth", "forbidden"));
-					end
-				end
-				return true;
+local function handle_vcard(event)
+	local session, stanza = event.origin, event.stanza;
+	local to = stanza.attr.to;
+	if stanza.attr.type == "get" then
+		local vCard;
+		if to then
+			local node, host = jid_split(to);
+			vCard = st.deserialize(vcards:get(node)); -- load vCard for user or server
+		else
+			vCard = st.deserialize(vcards:get(session.username));-- load user's own vCard
+		end
+		if vCard then
+			session.send(st.reply(stanza):add_child(vCard)); -- send vCard!
+		else
+			session.send(st.error_reply(stanza, "cancel", "item-not-found"));
+		end
+	else
+		if not to then
+			if vcards:set(session.username, st.preserialize(stanza.tags[1])) then
+				session.send(st.reply(stanza));
+			else
+				-- TODO unable to write file, file may be locked, etc, what's the correct error?
+				session.send(st.error_reply(stanza, "wait", "internal-server-error"));
 			end
-		end);
+		else
+			session.send(st.error_reply(stanza, "auth", "forbidden"));
+		end
+	end
+	return true;
+end
+
+module:hook("iq/bare/vcard-temp:vCard", handle_vcard);
+module:hook("iq/host/vcard-temp:vCard", handle_vcard);
 
-add_event_hook("stream-features", 
-					function (session, features)												
-						if session.type == "c2s" then
-							t_insert(features, "<feature var='vcard-temp'/>");
-						end
-					end);
+-- COMPAT w/0.8
+if module:get_option("vcard_compatibility") ~= nil then
+	module:log("error", "The vcard_compatibility option has been removed, see"..
+		"mod_compat_vcard in prosody-modules if you still need this.");
+end