Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:processone/ejabberd

This commit is contained in:
Evgeny Khramtsov 2019-05-19 11:23:29 +03:00
parent 2b523030cf 63e9b82a46
commit 17f9ffb7e7
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod_configure.erl
View File

@ -1161,7 +1161,7 @@ get_form(_Host, ?NS_ADMINL(<<"get-user-password">>),
get_form(_Host, ?NS_ADMINL(<<"change-user-password">>), get_form(_Host, ?NS_ADMINL(<<"change-user-password">>),
Lang) -> Lang) ->
{result, {result,
#xdata{title = ?T(Lang, <<"Get User Password">>), #xdata{title = ?T(Lang, <<"Change User Password">>),
type = form, type = form,
fields = [?HFIELD(), fields = [?HFIELD(),
#xdata_field{type = 'jid-single', #xdata_field{type = 'jid-single',

2
src/mod_offline_sql.erl
View File

@ -94,7 +94,7 @@ remove_old_messages(Days, LServer) ->
ejabberd_sql:sql_query_t( ejabberd_sql:sql_query_t(
?SQL("DELETE FROM spool" ?SQL("DELETE FROM spool"
" WHERE created_at <" " WHERE created_at <"
" NOW() - INTERVAL '%(Days)d DAY'")); " NOW() - %(Days)d * INTERVAL '1 DAY'"));
(_, _) -> (_, _) ->
ejabberd_sql:sql_query_t( ejabberd_sql:sql_query_t(
?SQL("DELETE FROM spool" ?SQL("DELETE FROM spool"

20
src/mod_vcard.erl
View File

@ -429,18 +429,26 @@ mk_search_form(JID, ServerHost, Lang) ->
Fs = [mk_tfield(Label, Var, Lang) || {Label, Var} <- SearchFields], Fs = [mk_tfield(Label, Var, Lang) || {Label, Var} <- SearchFields],
X = #xdata{type = form, X = #xdata{type = form,
title = Title, title = Title,
instructions = instructions = [make_instructions(Mod, Lang)],
[translate:translate(
Lang,
<<"Fill in the form to search for any matching "
"Jabber User (Add * to the end of field "
"to match substring)">>)],
fields = Fs}, fields = Fs},
#search{instructions = #search{instructions =
translate:translate( translate:translate(
Lang, <<"You need an x:data capable client to search">>), Lang, <<"You need an x:data capable client to search">>),
xdata = X}. xdata = X}.
make_instructions(Mod, Lang) ->
Fill = translate:translate(
Lang,
<<"Fill in the form to search for any matching "
"Jabber User">>),
Add = translate:translate(
Lang,
<<" (Add * to the end of field to match substring)">>),
case Mod of
mod_vcard_mnesia -> Fill;
_ -> str:concat(Fill, Add)
end.
-spec search_result(binary(), jid(), binary(), [xdata_field()]) -> xdata(). -spec search_result(binary(), jid(), binary(), [xdata_field()]) -> xdata().
search_result(Lang, JID, ServerHost, XFields) -> search_result(Lang, JID, ServerHost, XFields) ->
Mod = gen_mod:db_mod(ServerHost, ?MODULE), Mod = gen_mod:db_mod(ServerHost, ?MODULE),