aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_bosh.erl2
-rw-r--r--src/ejabberd_commands_doc.erl2
-rw-r--r--src/mod_admin_extra.erl2
-rw-r--r--src/mod_irc.erl3
-rw-r--r--src/mod_last.erl2
-rw-r--r--src/mod_muc.erl3
-rw-r--r--src/mod_multicast.erl3
-rw-r--r--src/mod_offline.erl8
-rw-r--r--src/mod_privacy.erl6
-rw-r--r--src/mod_proxy65_service.erl3
-rw-r--r--src/mod_pubsub.erl3
-rw-r--r--src/mod_vcard.erl6
12 files changed, 18 insertions, 25 deletions
diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl
index d4fc6809d..1dc103aee 100644
--- a/src/ejabberd_bosh.erl
+++ b/src/ejabberd_bosh.erl
@@ -966,7 +966,7 @@ attrs_to_body_attrs(Attrs) ->
[], Attrs).
to_int(S, Min) ->
- case jlib:binary_to_integer(S) of
+ case binary_to_integer(S) of
I when I >= Min -> I;
_ -> erlang:error(badarg)
end.
diff --git a/src/ejabberd_commands_doc.erl b/src/ejabberd_commands_doc.erl
index 477e4f5d5..bb519a600 100644
--- a/src/ejabberd_commands_doc.erl
+++ b/src/ejabberd_commands_doc.erl
@@ -5,7 +5,7 @@
%%% Created : 20 May 2008 by Badlop <badlop@process-one.net>
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2015 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
index 053ce8092..3c51e8c69 100644
--- a/src/mod_admin_extra.erl
+++ b/src/mod_admin_extra.erl
@@ -5,7 +5,7 @@
%%% Created : 10 Aug 2008 by Badlop <badlop@process-one.net>
%%%
%%%
-%%% ejabberd, Copyright (C) 2002-2008 ProcessOne
+%%% ejabberd, Copyright (C) 2002-2016 ProcessOne
%%%
%%% This program is free software; you can redistribute it and/or
%%% modify it under the terms of the GNU General Public License as
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_last.erl b/src/mod_last.erl
index 895a8e215..463eac051 100644
--- a/src/mod_last.erl
+++ b/src/mod_last.erl
@@ -217,7 +217,7 @@ import_start(LServer, DBType) ->
import(LServer, {sql, _}, DBType, <<"last">>, [LUser, TimeStamp, State]) ->
TS = case TimeStamp of
<<"">> -> 0;
- _ -> jlib:binary_to_integer(TimeStamp)
+ _ -> binary_to_integer(TimeStamp)
end,
LA = #last_activity{us = {LUser, LServer},
timestamp = TS,
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_offline.erl b/src/mod_offline.erl
index 241677b2a..f620e73c5 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -868,10 +868,10 @@ import(LServer, {sql, _}, DBType, <<"spool">>,
fxml:get_attr_s(<<"to">>, El#xmlel.attrs)),
Stamp = fxml:get_path_s(El, [{elem, <<"delay">>},
{attr, <<"stamp">>}]),
- TS = case jlib:datetime_string_to_timestamp(Stamp) of
- {MegaSecs, Secs, _} ->
- {MegaSecs, Secs, 0};
- undefined ->
+ TS = try xmpp_util:decode_timestamp(Stamp) of
+ {MegaSecs, Secs, _} ->
+ {MegaSecs, Secs, 0}
+ catch _:_ ->
p1_time_compat:timestamp()
end,
US = {LUser, LServer},
diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
index f1b8411d2..d6936e1b7 100644
--- a/src/mod_privacy.erl
+++ b/src/mod_privacy.erl
@@ -552,13 +552,13 @@ numeric_to_binary(<<0, _, _:6/binary, T/binary>>) ->
fun(X, Sum) ->
Sum*10000 + X
end, 0, [X || <<X:16>> <= T]),
- jlib:integer_to_binary(Res).
+ integer_to_binary(Res).
bool_to_binary(<<0>>) -> <<"0">>;
bool_to_binary(<<1>>) -> <<"1">>.
prepare_list_data(mysql, [ID|Row]) ->
- [jlib:binary_to_integer(ID)|Row];
+ [binary_to_integer(ID)|Row];
prepare_list_data(pgsql, [<<ID:64>>,
SType, SValue, SAction, SOrder, SMatchAll,
SMatchIQ, SMatchMessage, SMatchPresenceIn,
@@ -572,7 +572,7 @@ prepare_list_data(pgsql, [<<ID:64>>,
bool_to_binary(SMatchPresenceOut)].
prepare_id(mysql, ID) ->
- jlib:binary_to_integer(ID);
+ binary_to_integer(ID);
prepare_id(pgsql, <<ID:32>>) ->
ID.
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) ->
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-10 03:58:23 +0000