0.1 -> 0.2

[prosody.git] / plugins / mod_vcard.lua

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index 1d9b3d6307c6a87842665ff01050fc08b3f1aa66..10119252f25bec4fd3f648764f13bca55c9a9d7c 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -1,3 +1,23 @@
+-- Prosody IM v0.2
+-- Copyright (C) 2008 Matthew Wild
+-- Copyright (C) 2008 Waqas Hussain
+-- 
+-- This program is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU General Public License
+-- as published by the Free Software Foundation; either version 2
+-- of the License, or (at your option) any later version.
+-- 
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+-- 
+-- You should have received a copy of the GNU General Public License
+-- along with this program; if not, write to the Free Software
+-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+--
+
+
 
 require "util.datamanager"
 local datamanager = datamanager;
@@ -8,9 +28,9 @@ local t_concat, t_insert = table.concat, table.insert;
 require "util.jid"
 local jid_split = jid.split;
 
-require "core.discomanager".set("vcard", "vcard-temp");
+module:add_feature("vcard-temp");
 
-add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 
+module:add_iq_handler({"c2s", "s2sin"}, "vcard-temp", 
                function (session, stanza)
                        if stanza.tags[1].name == "vCard" then
                                local to = stanza.attr.to;
@@ -19,10 +39,10 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp",
                                        if to then
                                                local node, host = jid_split(to);
                                                if hosts[host] and hosts[host].type == "local" then
-                                                       vCard = st.deserialize(datamanager.load(node, host, "vCard")); -- load vCard for user or server
+                                                       vCard = st.deserialize(datamanager.load(node, host, "vcard")); -- load vCard for user or server
                                                end
                                        else
-                                               vCard = st.deserialize(datamanager.load(session.username, session.host, "vCard"));-- load user's own vCard
+                                               vCard = st.deserialize(datamanager.load(session.username, session.host, "vcard"));-- load user's own vCard
                                        end
                                        if vCard then
                                                session.send(st.reply(stanza):add_child(vCard)); -- send vCard!
@@ -31,7 +51,7 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp",
                                        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", st.preserialize(stanza.tags[1])) then
+                                               if datamanager.store(session.username, session.host, "vcard", 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?
@@ -46,8 +66,8 @@ add_iq_handler({"c2s", "s2sin"}, "vcard-temp",
                end);
 
 local feature_vcard_attr = { var='vcard-temp' };
-add_event_hook("stream-features", 
-                                       function (session, features)                                                                                            
+module:add_event_hook("stream-features",
+                                       function (session, features)
                                                if session.type == "c2s" then
                                                        features:tag("feature", feature_vcard_attr):up();
                                                end