diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-05-19 11:23:29 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-05-19 11:23:29 +0300 |
| commit | 17f9ffb7e73e614630cf35c4eeaf9c2d1cf055f9 (patch) | |
| tree | c7d57b5827cf03dc948bf0e50b3107902df42f4d /src | |
| parent | Report better errors on SQL terms decode failure (diff) | |
| parent | Fix PostgreSQL compatibility in mod_offline_sql:remove_old_messages (#2695) (diff) | |
Merge branch 'master' of github.com:processone/ejabberd
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_configure.erl | 2 | ||||
| -rw-r--r-- | src/mod_offline_sql.erl | 2 | ||||
| -rw-r--r-- | src/mod_vcard.erl | 20 |
3 files changed, 16 insertions, 8 deletions
diff --git a/src/mod_configure.erl b/src/mod_configure.erl index aa431e285..36ea75141 100644 --- a/src/mod_configure.erl +++ b/src/mod_configure.erl @@ -1161,7 +1161,7 @@ get_form(_Host, ?NS_ADMINL(<<"get-user-password">>), get_form(_Host, ?NS_ADMINL(<<"change-user-password">>), Lang) -> {result, - #xdata{title = ?T(Lang, <<"Get User Password">>), + #xdata{title = ?T(Lang, <<"Change User Password">>), type = form, fields = [?HFIELD(), #xdata_field{type = 'jid-single', diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl index cb0efa51e..972316954 100644 --- a/src/mod_offline_sql.erl +++ b/src/mod_offline_sql.erl @@ -94,7 +94,7 @@ remove_old_messages(Days, LServer) -> ejabberd_sql:sql_query_t( ?SQL("DELETE FROM spool" " WHERE created_at <" - " NOW() - INTERVAL '%(Days)d DAY'")); + " NOW() - %(Days)d * INTERVAL '1 DAY'")); (_, _) -> ejabberd_sql:sql_query_t( ?SQL("DELETE FROM spool" diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl index 5caecae50..6b6f5f7d5 100644 --- a/src/mod_vcard.erl +++ b/src/mod_vcard.erl @@ -429,18 +429,26 @@ mk_search_form(JID, ServerHost, Lang) -> Fs = [mk_tfield(Label, Var, Lang) || {Label, Var} <- SearchFields], X = #xdata{type = form, title = Title, - instructions = - [translate:translate( - Lang, - <<"Fill in the form to search for any matching " - "Jabber User (Add * to the end of field " - "to match substring)">>)], + instructions = [make_instructions(Mod, Lang)], fields = Fs}, #search{instructions = translate:translate( Lang, <<"You need an x:data capable client to search">>), 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(). search_result(Lang, JID, ServerHost, XFields) -> Mod = gen_mod:db_mod(ServerHost, ?MODULE), |