mod_posix: Check version of pposix

[prosody.git] / core / rostermanager.lua

diff --git a/core/rostermanager.lua b/core/rostermanager.lua
index 7d8d4ee1dcaf848f76275fc02fd245b1f537946a..fc8a586299393c4e0f0de0a05f1d7ed0d6afc210 100644 (file)
--- a/core/rostermanager.lua
+++ b/core/rostermanager.lua
@@ -1,8 +1,26 @@
+-- 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.
+--
+
+
 
-local mainlog = log;
-local function log(type, message)
-       mainlog(type, "rostermanager", message);
-end
+
+local log = require "util.logger".init("rostermanager");
 
 local setmetatable = setmetatable;
 local format = string.format;
@@ -11,9 +29,7 @@ local pairs, ipairs = pairs, ipairs;
 
 local hosts = hosts;
 
-require "util.datamanager"
-
-local datamanager = datamanager;
+local datamanager = require "util.datamanager"
 local st = require "util.stanza";
 
 module "rostermanager"
@@ -61,8 +77,8 @@ function roster_push(username, host, jid)
                else
                        stanza:tag("item", {jid = jid, subscription = "remove"});
                end
-               stanza:up();
-               stanza:up();
+               stanza:up(); -- move out from item
+               stanza:up(); -- move out from stanza
                -- stanza ready
                for _, session in pairs(hosts[host].sessions[username].sessions) do
                        if session.interested then
@@ -236,7 +252,7 @@ function unsubscribed(username, host, jid)
                if item.subscription == "from" then
                        item.subscription = "none";
                        changed = true;
-               elseif item.subscription == both then
+               elseif item.subscription == "both" then
                        item.subscription = "to";
                        changed = true;
                end