* src/mod_vcard.erl: Ensure mod_vcard to respect FORM_TYPE registry (EJAB-328).

* src/mod_vcard_ldap.erl: Likewise.
* src/mod_vcard_odbc.erl: Likewise.
* doc/guide.tex: Updated documentation.

SVN Revision: 990

3 files changed, 31 insertions, 31 deletions

diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
index 768ee954c..0335eac64 100644
--- a/src/mod_vcard.erl
+++ b/src/mod_vcard.erl
@@ -272,10 +272,10 @@ set_vcard(User, LServer, VCARD) ->
 					    "match substring)")}]},
 	   ?TLFIELD("text-single", "User", "user"),
 	   ?TLFIELD("text-single", "Full Name", "fn"),
-	   ?TLFIELD("text-single", "Name", "given"),
+	   ?TLFIELD("text-single", "Name", "first"),
 	   ?TLFIELD("text-single", "Middle Name", "middle"),
-	   ?TLFIELD("text-single", "Family Name", "family"),
-	   ?TLFIELD("text-single", "Nickname", "nickname"),
+	   ?TLFIELD("text-single", "Family Name", "last"),
+	   ?TLFIELD("text-single", "Nickname", "nick"),
 	   ?TLFIELD("text-single", "Birthday", "bday"),
 	   ?TLFIELD("text-single", "Country", "ctry"),
 	   ?TLFIELD("text-single", "City", "locality"),
@@ -442,10 +442,10 @@ search_result(Lang, JID, ServerHost, Data) ->
      {xmlelement, "reported", [],
       [?LFIELD("Jabber ID", "jid"),
        ?LFIELD("Full Name", "fn"),
-       ?LFIELD("Name", "given"),
+       ?LFIELD("Name", "first"),
        ?LFIELD("Middle Name", "middle"),
-       ?LFIELD("Family Name", "family"),
-       ?LFIELD("Nickname", "nickname"),
+       ?LFIELD("Family Name", "last"),
+       ?LFIELD("Nickname", "nick"),
        ?LFIELD("Birthday", "bday"),
        ?LFIELD("Country", "ctry"),
        ?LFIELD("City", "locality"),
@@ -465,10 +465,10 @@ record_to_item(R) ->
      [
        ?FIELD("jid",      User ++ "@" ++ Server),
        ?FIELD("fn",       R#vcard_search.fn),
-       ?FIELD("family",   R#vcard_search.family),
-       ?FIELD("given",    R#vcard_search.given),
+       ?FIELD("last",     R#vcard_search.family),
+       ?FIELD("first",    R#vcard_search.given),
        ?FIELD("middle",   R#vcard_search.middle),
-       ?FIELD("nickname", R#vcard_search.nickname),
+       ?FIELD("nick",     R#vcard_search.nickname),
        ?FIELD("bday",     R#vcard_search.bday),
        ?FIELD("ctry",     R#vcard_search.ctry),
        ?FIELD("locality", R#vcard_search.locality),
@@ -530,10 +530,10 @@ filter_fields([{SVar, [Val]} | Ds], Match, LServer)
 			       Match#vcard_search{us = {make_val(LVal), Host}}
 		       end;
                    "fn"       -> Match#vcard_search{lfn       = make_val(LVal)};
-                   "family"   -> Match#vcard_search{lfamily   = make_val(LVal)};
-                   "given"    -> Match#vcard_search{lgiven    = make_val(LVal)};
+                   "last"     -> Match#vcard_search{lfamily   = make_val(LVal)};
+                   "first"    -> Match#vcard_search{lgiven    = make_val(LVal)};
                    "middle"   -> Match#vcard_search{lmiddle   = make_val(LVal)};
-                   "nickname" -> Match#vcard_search{lnickname = make_val(LVal)};
+                   "nick"     -> Match#vcard_search{lnickname = make_val(LVal)};
                    "bday"     -> Match#vcard_search{lbday     = make_val(LVal)};
                    "ctry"     -> Match#vcard_search{lctry     = make_val(LVal)};
                    "locality" -> Match#vcard_search{llocality = make_val(LVal)};
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 1d6041e57..f78d4abd4 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -61,7 +61,7 @@
 	[{"NICKNAME", "%u", []},
 	 {"FN", "%s", ["displayName"]},
 	 {"FAMILY", "%s", ["sn"]},
-	 {"GIVEN", "%s", ["givenName"]},
+	 {"FIRST", "%s", ["givenName"]},
 	 {"MIDDLE", "%s", ["initials"]},
 	 {"ORGNAME", "%s", ["o"]},
 	 {"ORGUNIT", "%s", ["ou"]},
@@ -97,10 +97,10 @@
 
 -define(SEARCH_REPORTED,
 	[{"Full Name", "FN"},
-	 {"Given Name", "GIVEN"},
+	 {"Given Name", "FIRST"},
 	 {"Middle Name", "MIDDLE"},
-	 {"Family Name", "FAMILY"},
-	 {"Nickname", "NICKNAME"},
+	 {"Family Name", "LAST"},
+	 {"Nickname", "NICK"},
 	 {"Birthday", "BDAY"},
 	 {"Country", "CTRY"},
 	 {"City", "LOCALITY"},
@@ -300,7 +300,7 @@ ldap_attribute_to_vcard(vCard, {"fn", Value}) ->
     {xmlelement,"FN",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCard, {"nickname", Value}) ->
-    {xmlelement,"NICKNAME",[],[{xmlcdata,Value}]};
+    {xmlelement,"NICK",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCard, {"title", Value}) ->
     {xmlelement,"TITLE",[],[{xmlcdata,Value}]};
@@ -332,10 +332,10 @@ ldap_attribute_to_vcard(vCard, {"photo", Value}) ->
 			    {xmlelement,"BINVAL",[],[{xmlcdata, jlib:encode_base64(Value)}]}]};
 
 ldap_attribute_to_vcard(vCardN, {"family", Value}) ->
-    {xmlelement,"FAMILY",[],[{xmlcdata,Value}]};
+    {xmlelement,"LAST",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCardN, {"given", Value}) ->
-    {xmlelement,"GIVEN",[],[{xmlcdata,Value}]};
+    {xmlelement,"FIRST",[],[{xmlcdata,Value}]};
 
 ldap_attribute_to_vcard(vCardN, {"middle", Value}) ->
     {xmlelement,"MIDDLE",[],[{xmlcdata,Value}]};
diff --git a/src/mod_vcard_odbc.erl b/src/mod_vcard_odbc.erl
index 278040ed0..0155e48a0 100644
--- a/src/mod_vcard_odbc.erl
+++ b/src/mod_vcard_odbc.erl
@@ -272,10 +272,10 @@ set_vcard(User, LServer, VCARD) ->
 					    "match substring)")}]},
 	   ?TLFIELD("text-single", "User", "user"),
 	   ?TLFIELD("text-single", "Full Name", "fn"),
-	   ?TLFIELD("text-single", "Name", "given"),
+	   ?TLFIELD("text-single", "Name", "first"),
 	   ?TLFIELD("text-single", "Middle Name", "middle"),
-	   ?TLFIELD("text-single", "Family Name", "family"),
-	   ?TLFIELD("text-single", "Nickname", "nickname"),
+	   ?TLFIELD("text-single", "Family Name", "last"),
+	   ?TLFIELD("text-single", "Nickname", "nick"),
 	   ?TLFIELD("text-single", "Birthday", "bday"),
 	   ?TLFIELD("text-single", "Country", "ctry"),
 	   ?TLFIELD("text-single", "City", "locality"),
@@ -439,10 +439,10 @@ search_result(Lang, JID, ServerHost, Data) ->
      {xmlelement, "reported", [],
       [?LFIELD("Jabber ID", "jid"),
        ?LFIELD("Full Name", "fn"),
-       ?LFIELD("Name", "given"),
+       ?LFIELD("Name", "first"),
        ?LFIELD("Middle Name", "middle"),
-       ?LFIELD("Family Name", "family"),
-       ?LFIELD("Nickname", "nickname"),
+       ?LFIELD("Family Name", "last"),
+       ?LFIELD("Nickname", "nick"),
        ?LFIELD("Birthday", "bday"),
        ?LFIELD("Country", "ctry"),
        ?LFIELD("City", "locality"),
@@ -465,10 +465,10 @@ record_to_item(LServer, {Username, FN, Family, Given, Middle,
      [
        ?FIELD("jid",      Username ++ "@" ++ LServer),
        ?FIELD("fn",       FN),
-       ?FIELD("family",   Family),
-       ?FIELD("given",    Given),
+       ?FIELD("last",     Family),
+       ?FIELD("first",    Given),
        ?FIELD("middle",   Middle),
-       ?FIELD("nickname", Nickname),
+       ?FIELD("nick",     Nickname),
        ?FIELD("bday",     BDay),
        ?FIELD("ctry",     CTRY),
        ?FIELD("locality", Locality),
@@ -533,10 +533,10 @@ filter_fields([{SVar, [Val]} | Ds], Match, LServer)
     NewMatch = case SVar of
                    "user"     -> make_val(Match, "lusername", LVal);
                    "fn"       -> make_val(Match, "lfn",       LVal);
-                   "family"   -> make_val(Match, "lfamily",   LVal);
-                   "given"    -> make_val(Match, "lgiven",    LVal);
+                   "last"     -> make_val(Match, "lfamily",   LVal);
+                   "first"    -> make_val(Match, "lgiven",    LVal);
                    "middle"   -> make_val(Match, "lmiddle",   LVal);
-                   "nickname" -> make_val(Match, "lnickname", LVal);
+                   "nick"     -> make_val(Match, "lnickname", LVal);
                    "bday"     -> make_val(Match, "lbday",     LVal);
                    "ctry"     -> make_val(Match, "lctry",     LVal);
                    "locality" -> make_val(Match, "llocality", LVal);