sessionmanager, mod_tls: Mark a session as secure when TLS is active

[prosody.git] / plugins / mod_vcard.lua

diff --git a/plugins/mod_vcard.lua b/plugins/mod_vcard.lua
index 4f78867b9fd40f66fc168e3dc3895a932d54daf2..2e8aea02b41f50f0ef58472140543c0ae971aeac 100644 (file)
--- a/plugins/mod_vcard.lua
+++ b/plugins/mod_vcard.lua
@@ -1,31 +1,20 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM v0.4
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
 
-require "util.datamanager"
-local datamanager = datamanager;
+local hosts = _G.hosts;
+local datamanager = require "util.datamanager"
 
 local st = require "util.stanza"
 local t_concat, t_insert = table.concat, table.insert;
 
-require "util.jid"
+local jid = require "util.jid"
 local jid_split = jid.split;
 
 module:add_feature("vcard-temp");
@@ -39,10 +28,10 @@ module: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!
@@ -51,7 +40,7 @@ module: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?
@@ -66,8 +55,8 @@ module:add_iq_handler({"c2s", "s2sin"}, "vcard-temp",
                end);
 
 local feature_vcard_attr = { var='vcard-temp' };
-module: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