diff options
author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
---|---|---|
committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/nodetree_tree_sql.erl | |
parent | Log modules startup (diff) |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to 'src/nodetree_tree_sql.erl')
-rw-r--r-- | src/nodetree_tree_sql.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl index 2987dbdc3..c311ea3ab 100644 --- a/src/nodetree_tree_sql.erl +++ b/src/nodetree_tree_sql.erl @@ -94,7 +94,7 @@ set_node(Record) when is_record(Record, pubsub_node) -> case Nidx of none -> Txt = <<"Node index not found">>, - {error, xmpp:err_internal_server_error(Txt, ?MYLANG)}; + {error, xmpp:err_internal_server_error(Txt, ejabberd_config:get_mylang())}; _ -> lists:foreach(fun ({Key, Value}) -> SKey = iolist_to_binary(atom_to_list(Key)), @@ -121,9 +121,9 @@ get_node(Host, Node) -> {selected, [RItem]} -> raw_to_node(Host, RItem); {'EXIT', _Reason} -> - {error, xmpp:err_internal_server_error(<<"Database failure">>, ?MYLANG)}; + {error, xmpp:err_internal_server_error(<<"Database failure">>, ejabberd_config:get_mylang())}; _ -> - {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)} + {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())} end. get_node(Nidx) -> @@ -135,9 +135,9 @@ get_node(Nidx) -> {selected, [{Host, Node, Parent, Type}]} -> raw_to_node(Host, {Node, Parent, Type, Nidx}); {'EXIT', _Reason} -> - {error, xmpp:err_internal_server_error(<<"Database failure">>, ?MYLANG)}; + {error, xmpp:err_internal_server_error(<<"Database failure">>, ejabberd_config:get_mylang())}; _ -> - {error, xmpp:err_item_not_found(<<"Node not found">>, ?MYLANG)} + {error, xmpp:err_item_not_found(<<"Node not found">>, ejabberd_config:get_mylang())} end. get_nodes(Host, _From) -> @@ -259,9 +259,9 @@ create_node(Host, Node, Type, Owner, Options, Parents) -> {error, xmpp:err_forbidden()} end; {result, _} -> - {error, xmpp:err_conflict(<<"Node already exists">>, ?MYLANG)}; + {error, xmpp:err_conflict(<<"Node already exists">>, ejabberd_config:get_mylang())}; {error, db_fail} -> - {error, xmpp:err_internal_server_error(<<"Database failure">>, ?MYLANG)} + {error, xmpp:err_internal_server_error(<<"Database failure">>, ejabberd_config:get_mylang())} end. delete_node(Host, Node) -> |