mod_console: Update for new net.server API

[prosody.git] / util / datamanager.lua

diff --git a/util/datamanager.lua b/util/datamanager.lua
index 54cf195932eba962e254d9016da76ea51311116f..4d07d6ccfdcdbd9d5246f0beb0402f32467554ed 100644 (file)
--- a/util/datamanager.lua
+++ b/util/datamanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -62,7 +62,7 @@ end
 local function callback(username, host, datastore, data)
        for _, f in ipairs(callbacks) do
                username, host, datastore, data = f(username, host, datastore, data);
-               if not username then break; end
+               if username == false then break; end
        end
        
        return username, host, datastore, data;
@@ -123,7 +123,7 @@ function store(username, host, datastore, data)
        end
 
        username, host, datastore, data = callback(username, host, datastore, data);
-       if not username then
+       if username == false then
                return true; -- Don't save this data at all
        end
 
@@ -137,7 +137,7 @@ function store(username, host, datastore, data)
        append(f, data);
        f:close();
        if next(data) == nil then -- try to delete empty datastore
-               log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host);
+               log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
                os_remove(getpath(username, host, datastore));
        end
        -- we write data even when we are deleting because lua doesn't have a
@@ -147,7 +147,7 @@ end
 
 function list_append(username, host, datastore, data)
        if not data then return; end
-       if callback and callback(username, host, datastore) then return true; end
+       if callback(username, host, datastore) == false then return true; end
        -- save the datastore
        local f, msg = io_open(getpath(username, host, datastore, "list", true), "a+");
        if not f then
@@ -165,7 +165,7 @@ function list_store(username, host, datastore, data)
        if not data then
                data = {};
        end
-       if callback and callback(username, host, datastore) then return true; end
+       if callback(username, host, datastore) == false then return true; end
        -- save the datastore
        local f, msg = io_open(getpath(username, host, datastore, "list", true), "w+");
        if not f then
@@ -179,7 +179,7 @@ function list_store(username, host, datastore, data)
        end
        f:close();
        if next(data) == nil then -- try to delete empty datastore
-               log("debug", "Removing empty %s datastore for user %s@%s", datastore, username, host);
+               log("debug", "Removing empty %s datastore for user %s@%s", datastore, username or "nil", host or "nil");
                os_remove(getpath(username, host, datastore, "list"));
        end
        -- we write data even when we are deleting because lua doesn't have a