Merge pull request #4596 from sstrigler/mod_invites-fix-form-type

fix form-type value

Author: badlop

include/mod_invites.hrl

@@ -3,6 +3,7 @@
 
 -define(NS_INVITE_INVITE, <<"urn:xmpp:invite#invite">>).
 -define(NS_INVITE_CREATE_ACCOUNT, <<"urn:xmpp:invite#create-account">>).
+-define(NS_INVITE_INVITATION, <<"urn:xmpp:invite#invitation">>).
 
 -define(OVERUSE_LIMIT, 1000).
 

src/mod_invites.erl

@@ -692,7 +692,7 @@ adhoc_commands(_Acc,
                                          Lang,
                                          [#xdata_field{var = <<"FORM_TYPE">>,
                                                        type = 'hidden',
-                                                       values = [?NS_INVITE_INVITE]},
+                                                       values = [?NS_INVITE_INVITATION]},
                                           #xdata_field{var = <<"uri">>,
                                                        label = trans(Lang, <<"Invite URI">>),
                                                        type = 'text-single',
@@ -737,8 +737,8 @@ adhoc_commands(_Acc,
                                                Invite,
                                                Lang,
                                                [#xdata_field{var = <<"FORM_TYPE">>,
-                                                       type = 'hidden',
-                                                       values = [?NS_INVITE_INVITE]},
+                                                             type = 'hidden',
+                                                             values = [?NS_INVITE_INVITATION]},
                                                 #xdata_field{var = <<"uri">>,
                                                              label = trans(Lang, <<"Invite URI">>),
                                                              type = 'text-single',

test/invites_tests.erl

@@ -297,7 +297,7 @@ adhoc_command_invite(Config) ->
                   #iq{type = set,
                       to = ServerJID,
                       sub_els = [Command]}),
-    ?match(?NS_INVITE_INVITE,
+    ?match(?NS_INVITE_INVITATION,
            xdata_field(<<"FORM_TYPE">>, XdataFields)),
     Uri = xdata_field(<<"uri">>, XdataFields),
     ?match({match, [_, _]},
@@ -330,7 +330,7 @@ adhoc_command_create_account(Config) ->
     NewOpts = gen_mod:set_opt(access_create_account, account_invite, OldOpts),
     update_module_opts(Server, mod_invites, NewOpts),
     ResultXDataFields1 = test_create_account(Config, <<>>, <<"0">>),
-    ?match(?NS_INVITE_INVITE,
+    ?match(?NS_INVITE_INVITATION,
            xdata_field(<<"FORM_TYPE">>, ResultXDataFields1)),
     ?match({match, [_, _]},
            re:run(xdata_field(<<"uri">>, ResultXDataFields1),