X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fejabberd2prosody.lua;h=a231abd8c0505b7e1b5dae196cd7741e67fd5140;hb=ea1e4b31330ba5c043084ef4afbcdf5fa26986be;hp=4fef3f3abbf434e4eac798d8ee6650cb6f7202b1;hpb=ee85d0c79aa2d7bfa3f1280f19792e1d007b6519;p=prosody.git

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index 4fef3f3a..a231abd8 100755
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -9,9 +9,16 @@
 
 
 
+package.path = package.path ..";../?.lua";
+
+if arg[0]:match("^./") then
+	package.path = package.path .. ";"..arg[0]:gsub("/ejabberd2prosody.lua$", "/?.lua");
+end
+
 require "erlparse";
 
-package.path = package.path ..";../?.lua";
+prosody = {};
+
 local serialize = require "util.serialization".serialize;
 local st = require "util.stanza";
 package.loaded["util.logger"] = {init = function() return function() end; end}
@@ -44,7 +51,7 @@ function vcard(node, host, stanza)
 end
 function password(node, host, password)
 	local ret, err = dm.store(node, host, "accounts", {password = password});
-	print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);
+	print("["..(err or "success").."] accounts: "..node.."@"..host);
 end
 function roster(node, host, jid, item)
 	local roster = dm.load(node, host, "roster") or {};
@@ -86,13 +93,24 @@ local filters = {
 		local name = tuple[5]; local subscription = tuple[6];
 		local ask = tuple[7]; local groups = tuple[8];
 		if type(name) ~= type("") then name = nil; end
-		if ask == "none" then ask = nil; elseif ask == "out" then ask = "subscribe" elseif ask == "in" then
+		if ask == "none" then
+			ask = nil;
+		elseif ask == "out" then
+			ask = "subscribe"
+		elseif ask == "in" then
+			roster_pending(node, host, contact);
+			ask = nil;
+		elseif ask == "both" then
 			roster_pending(node, host, contact);
-			return;
-		else error(ask) end
+			ask = "subscribe";
+		else error("Unknown ask type: "..ask); end
 		if subscription ~= "both" and subscription ~= "from" and subscription ~= "to" and subscription ~= "none" then error(subscription) end
 		local item = {name = name, ask = ask, subscription = subscription, groups = {}};
-		for _, g in ipairs(groups) do item.groups[g] = true; end
+		for _, g in ipairs(groups) do
+			if type(g) == "string" then
+				item.groups[g] = true;
+			end
+		end
 		roster(node, host, contact, item);
 	end;
 	private_storage = function(tuple)