Move copyright definition to ejabberd.hrl

6 files changed, 7 insertions, 14 deletions

diff --git a/src/mod_irc.erl b/src/mod_irc.erl
index 2fb35414d..3dd0e492d 100644
--- a/src/mod_irc.erl
+++ b/src/mod_irc.erl
@@ -420,10 +420,9 @@ iq_disco(ServerHost, Node, Lang) ->
 
 iq_get_vcard(Lang) ->
     Desc = translate:translate(Lang, <<"ejabberd IRC module">>),
-    Copyright = <<"Copyright (c) 2003-2016 ProcessOne">>,
     #vcard_temp{fn = <<"ejabberd/mod_irc">>,
 		url = ?EJABBERD_URI,
-		desc = <<Desc/binary, $\n, Copyright/binary>>}.
+		desc = <<Desc/binary, $\n, ?COPYRIGHT>>}.
 
 command_items(ServerHost, Host, Lang) ->
     lists:map(fun({Node, Name, _Function}) ->
diff --git a/src/mod_muc.erl b/src/mod_muc.erl
index 28008aaae..554a21704 100644
--- a/src/mod_muc.erl
+++ b/src/mod_muc.erl
@@ -429,11 +429,10 @@ do_route1(Host, ServerHost, Access, HistorySize, RoomShaper,
 -spec process_vcard(iq()) -> iq().
 process_vcard(#iq{type = get, lang = Lang, sub_els = [#vcard_temp{}]} = IQ) ->
     Desc = translate:translate(Lang, <<"ejabberd MUC module">>),
-    Copyright = <<"Copyright (c) 2003-2016 ProcessOne">>,
     xmpp:make_iq_result(
       IQ, #vcard_temp{fn = <<"ejabberd/mod_muc">>,
 		      url = ?EJABBERD_URI,
-		      desc = <<Desc/binary, $\n, Copyright/binary>>});
+		      desc = <<Desc/binary, $\n, ?COPYRIGHT>>});
 process_vcard(#iq{type = set, lang = Lang} = IQ) ->
     Txt = <<"Value 'set' of 'type' attribute is not allowed">>,
     xmpp:make_error(IQ, xmpp:err_not_allowed(Txt, Lang));
diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl
index 72046491f..0aa2270ae 100644
--- a/src/mod_multicast.erl
+++ b/src/mod_multicast.erl
@@ -268,10 +268,9 @@ iq_disco_info(From, Lang, State) ->
 
 iq_vcard(Lang) ->
     Desc = translate:translate(Lang, <<"ejabberd Multicast service">>),
-    Copyright = <<"Copyright (c) 2002-2016 ProcessOne">>,
     #vcard_temp{fn = <<"ejabberd/mod_multicast">>,
 		url = ?EJABBERD_URI,
-		desc = <<Desc/binary, $\n, Copyright/binary>>}.
+		desc = <<Desc/binary, $\n, ?COPYRIGHT>>}.
 
 %%%-------------------------
 %%% Route
diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl
index 789771d7d..0f69086e0 100644
--- a/src/mod_proxy65_service.erl
+++ b/src/mod_proxy65_service.erl
@@ -136,11 +136,10 @@ process_vcard(#iq{type = set, lang = Lang} = IQ) ->
     xmpp:make_error(IQ, xmpp:err_not_allowed(Txt, Lang));
 process_vcard(#iq{type = get, lang = Lang} = IQ) ->
     Desc = translate:translate(Lang, <<"ejabberd SOCKS5 Bytestreams module">>),
-    Copyright = <<"Copyright (c) 2003-2016 ProcessOne">>,
     xmpp:make_iq_result(
       IQ, #vcard_temp{fn = <<"ejabberd/mod_proxy65">>,
 		      url = ?EJABBERD_URI,
-		      desc = <<Desc/binary, $\n, Copyright/binary>>}).
+		      desc = <<Desc/binary, $\n, ?COPYRIGHT>>}).
 
 -spec process_bytestreams(iq()) -> iq().
 process_bytestreams(#iq{type = get, from = JID, to = To, lang = Lang} = IQ) ->
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index a138b1896..c379760ed 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -1186,10 +1186,9 @@ iq_sm(#iq{to = To, sub_els = [SubEl]} = IQ) ->
 -spec iq_get_vcard(binary()) -> vcard_temp().
 iq_get_vcard(Lang) ->
     Desc = translate:translate(Lang, <<"ejabberd Publish-Subscribe module">>),
-    Copyright = <<"Copyright (c) 2004-2016 ProcessOne">>,
     #vcard_temp{fn = <<"ejabberd/mod_pubsub">>,
 		url = ?EJABBERD_URI,
-		desc = <<Desc/binary, $\n, Copyright/binary>>}.
+		desc = <<Desc/binary, $\n, ?COPYRIGHT>>}.
 
 -spec iq_pubsub(binary() | ljid(), atom(), iq()) ->
 		       {result, pubsub()} | {error, stanza_error()}.
diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
index dc9476206..843281ef8 100644
--- a/src/mod_vcard.erl
+++ b/src/mod_vcard.erl
@@ -191,11 +191,10 @@ process_local_iq(#iq{type = set, lang = Lang} = IQ) ->
     xmpp:make_error(IQ, xmpp:err_not_allowed(Txt, Lang));
 process_local_iq(#iq{type = get, lang = Lang} = IQ) ->
     Desc = translate:translate(Lang, <<"Erlang Jabber Server">>),
-    Copyright = <<"Copyright (c) 2002-2016 ProcessOne">>,
     xmpp:make_iq_result(
       IQ, #vcard_temp{fn = <<"ejabberd">>,
 		      url = ?EJABBERD_URI,
-		      desc = <<Desc/binary, $\n, Copyright/binary>>,
+		      desc = <<Desc/binary, $\n, ?COPYRIGHT>>,
 		      bday = <<"2002-11-16">>}).
 
 -spec process_sm_iq(iq()) -> iq().
@@ -228,11 +227,10 @@ process_vcard(#iq{type = set, lang = Lang} = IQ) ->
     xmpp:make_error(IQ, xmpp:err_not_allowed(Txt, Lang));
 process_vcard(#iq{type = get, lang = Lang} = IQ) ->
     Desc = translate:translate(Lang, <<"ejabberd vCard module">>),
-    Copyright = <<"Copyright (c) 2003-2016 ProcessOne">>,
     xmpp:make_iq_result(
       IQ, #vcard_temp{fn = <<"ejabberd/mod_vcard">>,
 		      url = ?EJABBERD_URI,
-		      desc = <<Desc/binary, $\n, Copyright/binary>>}).
+		      desc = <<Desc/binary, $\n, ?COPYRIGHT>>}).
 
 -spec process_search(iq()) -> iq().
 process_search(#iq{type = get, to = To, lang = Lang} = IQ) ->