mod_saslauth: Make service_name configurable for CyrusSASL users.

[prosody.git] / util / jid.lua

diff --git a/util/jid.lua b/util/jid.lua
index 52fd0f44cd5d24b96ccdc9a2b36f7083328fbb73..b43247ccbbd0d055bbeca6ff6e5c78a8e8ab2ccf 100644 (file)
--- a/util/jid.lua
+++ b/util/jid.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- 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.
 --
 
 
@@ -26,7 +15,7 @@ local resourceprep = require "util.encodings".stringprep.resourceprep;
 
 module "jid"
 
-function split(jid)
+local function _split(jid)
        if not jid then return; end
        local node, nodepos = match(jid, "^([^@]+)@()");
        local host, hostpos = match(jid, "^([^@/]+)()", nodepos)
@@ -35,17 +24,18 @@ function split(jid)
        if (not host) or ((not resource) and #jid >= hostpos) then return nil, nil, nil; end
        return node, host, resource;
 end
+split = _split;
 
 function bare(jid)
-       local node, host = split(jid);
+       local node, host = _split(jid);
        if node and host then
                return node.."@"..host;
        end
        return host;
 end
 
-function prepped_split(jid)
-       local node, host, resource = split(jid);
+local function _prepped_split(jid)
+       local node, host, resource = _split(jid);
        if host then
                host = nameprep(host);
                if not host then return; end
@@ -60,9 +50,10 @@ function prepped_split(jid)
                return node, host, resource;
        end
 end
+prepped_split = _prepped_split;
 
 function prep(jid)
-       local node, host, resource = prepped_split(jid);
+       local node, host, resource = _prepped_split(jid);
        if host then
                if node then
                        host = node .. "@" .. host;
@@ -74,4 +65,17 @@ function prep(jid)
        return host;
 end
 
+function join(node, host, resource)
+       if node and host and resource then
+               return node.."@"..host.."/"..resource;
+       elseif node and host then
+               return node.."@"..host;
+       elseif host and resource then
+               return host.."/"..resource;
+       elseif host then
+               return host;
+       end
+       return nil; -- Invalid JID
+end
+
 return _M;