+2004-02-26 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
+
+ * src/mod_muc/mod_muc_room.erl: Updated error codes, removed
+ trailing "-" in history. updated subject sending, added <title/>
+ in configuration form (thanks to Sergei Golovan)
+
+ * src/mod_irc/mod_irc.erl: Added vCard, ejabberd:configure
+ replaced with jabber:iq:register (thanks to Sergei Golovan)
+
+ * src/mod_configure.erl: Updated "xml:lang" usage, updated some
+ messages (thanks to Sergei Golovan)
+ * src/mod_configure2.erl: Likewise
+ * src/mod_disco.erl: Likewise
+ * src/mod_register.erl: Likewise
+ * src/mod_vcard.erl: Likewise
+ * src/mod_irc/mod_irc.erl: Likewise
+ * src/mod_muc/mod_muc.erl: Likewise
+ * src/mod_muc/mod_muc_room.erl: Likewise
+ * src/mod_pubsub/mod_pubsub.erl: Likewise
+
+ * src/jlib.hrl: Added "lang" field in "iq" record (thanks to
+ Sergei Golovan)
+ * src/jlib.erl: Likewise
+
+ * src/ejabberd_c2s.erl: Updated to latest JEP-0078 (thanks to
+ Sergei Golovan)
+
+2004-02-18 Alexey Shchepin <alexey@sevcom.net>
+
+ * src/ejabberd_sm.erl: Bugfix
+
2004-02-15 Alexey Shchepin <alexey@sevcom.net>
* src/mod_muc/mod_muc_room.erl: Support for history management
{xmlelement, Name, Attrs,
[{xmlelement, "query", [{"xmlns", ?NS_AUTH}],
[{xmlelement, "username", [], [{xmlcdata, U}]},
- {xmlelement, "password", [], []}
+ {xmlelement, "password", [], []},
+ {xmlelement, "resource", [], []}
]}]}
end,
send_element(StateData, Res),
true ->
if
Subsc ->
- catch mod_offline:store_packet(
- From, To, Packet);
+ case ejabberd_auth:is_user_exists(LUser) of
+ true ->
+ catch mod_offline:store_packet(
+ From, To, Packet);
+ _ ->
+ Err = jlib:make_error_reply(
+ Packet, ?ERR_SERVICE_UNAVAILABLE),
+ ejabberd_router:route(To, From, Err)
+ end;
true ->
ok
end
iq_query_info({xmlelement, Name, Attrs, Els}) when Name == "iq" ->
ID = xml:get_attr_s("id", Attrs),
Type = xml:get_attr_s("type", Attrs),
+ Lang = xml:get_attr_s("xml:lang", Attrs),
Type1 = case Type of
"set" -> set;
"get" -> get;
XMLNS = xml:get_attr_s("xmlns", Attrs2),
if
XMLNS /= "" ->
- #iq{id = ID, type = Type1, xmlns = XMLNS,
+ #iq{id = ID,
+ type = Type1,
+ xmlns = XMLNS,
+ lang = Lang,
sub_el = {xmlelement, Name2, Attrs2, Els2}};
true ->
invalid
-define(NS_SESSION, "urn:ietf:params:xml:ns:xmpp-session").
-define(NS_BIND, "urn:ietf:params:xml:ns:xmpp-bind").
+-define(NS_FEATURE_IQAUTH, "http://jabber.org/features/iq-auth").
+
% TODO: remove "code" attribute (currently it used for backward-compatibility)
-define(STANZA_ERROR(Code, Type, Condition),
{xmlelement, "error",
-record(iq, {id = "",
type,
xmlns = "",
+ lang = "",
sub_el}).
gen_iq_handler:remove_iq_handler(ejabberd_sm, ?NS_EJABBERD_CONFIG).
-process_local_iq(From, _To, #iq{id = ID, type = Type,
- xmlns = XMLNS, sub_el = SubEl} = IQ) ->
+process_local_iq(From, _To, #iq{id = ID, type = Type, xmlns = XMLNS,
+ lang = Lang, sub_el = SubEl} = IQ) ->
case acl:match_rule(configure, From) of
deny ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
allow ->
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
case Type of
set ->
XDataEl = find_xdata_el(SubEl),
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "DB Tables Configuration")}]},
+ Lang, "DB Tables Configuration at ") ++
+ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Stop Modules")}]},
+ Lang, "Stop Modules at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Start Modules")}]},
+ Lang, "Start Modules at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Backup to File")}]},
+ Lang, "Backup to File at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Restore Backup from File")}]},
+ Lang, "Restore Backup from File at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Dump Backup to Text File")}]},
+ Lang, "Dump Backup to Text File at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Import User from File")}]},
+ Lang, "Import User from File at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Import User from Dir")}]},
+ Lang, "Import Users from Dir at ") ++ ENode}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
Lang, "Choose host name")}]},
{xmlelement, "field", [{"type", "text-single"},
{"label",
- translate:translate(Lang, "Host name")},
+ translate:translate(Lang,
+ "Host name")},
{"var", "hostname"}],
[{xmlelement, "value", [], [{xmlcdata, ?MYNAME}]}]}
]}]};
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "ACLs Configuration")}]},
+ Lang, "Access Control List Configuration")}]},
%{xmlelement, "instructions", [],
% [{xmlcdata,
% translate:translate(
% Lang, "")}]},
{xmlelement, "field", [{"type", "text-multi"},
{"label",
- translate:translate(Lang, "ACLs")},
+ translate:translate(
+ Lang, "Access control lists")},
{"var", "acls"}],
lists:map(fun(S) ->
{xmlelement, "value", [], [{xmlcdata, S}]}
{xmlelement, "field", [{"type", "text-multi"},
{"label",
translate:translate(
- Lang, "Access Rules")},
+ Lang, "Access rules")},
{"var", "access"}],
lists:map(fun(S) ->
{xmlelement, "value", [], [{xmlcdata, S}]}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
process_sm_iq(From, To,
- #iq{type = Type, xmlns = XMLNS, sub_el = SubEl} = IQ) ->
+ #iq{type = Type, xmlns = XMLNS, lang = Lang, sub_el = SubEl} = IQ) ->
case acl:match_rule(configure, From) of
deny ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
allow ->
#jid{user = User} = To,
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
case Type of
set ->
XDataEl = find_xdata_el(SubEl),
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Administration of " ++ User)}]},
+ Lang, "Administration of ") ++ User}]},
%{xmlelement, "instructions", [],
% [{xmlcdata,
% translate:translate(
gen_iq_handler:remove_iq_handler(ejabberd_sm, ?NS_IQDATA).
-process_local_iq(From, _To, #iq{type = Type, sub_el = SubEl} = IQ) ->
+process_local_iq(From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->
case acl:match_rule(configure, From) of
deny ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
allow ->
- %Lang = xml:get_tag_attr_s("xml:lang", SubEl),
case Type of
set ->
IQ#iq{type = error,
sub_el = [SubEl, ?ERR_FEATURE_NOT_IMPLEMENTED]};
%case xml:get_tag_attr_s("type", SubEl) of
% "cancel" ->
- % {iq, ID, result, XMLNS,
- % [{xmlelement, "query", [{"xmlns", XMLNS}], []}]};
+ % IQ#iq{type = result,
+ % sub_el = [{xmlelement, "query",
+ % [{"xmlns", XMLNS}], []}]};
% "submit" ->
% XData = jlib:parse_xdata_submit(SubEl),
% case XData of
% invalid ->
- % {iq, ID, error, XMLNS,
- % [SubEl, ?ERR_BAD_REQUEST]};
+ % IQ#iq{type = error,
+ % sub_el = [SubEl, ?ERR_BAD_REQUEST]};
% _ ->
% Node =
% string:tokens(
% "/"),
% case set_form(Node, Lang, XData) of
% {result, Res} ->
- % {iq, ID, result, XMLNS,
- % [{xmlelement, "query",
- % [{"xmlns", XMLNS}],
- % Res
- % }]};
+ % IQ#iq{type = result,
+ % sub_el = [{xmlelement, "query",
+ % [{"xmlns", XMLNS}],
+ % Res
+ % }]};
% {error, Error} ->
- % {iq, ID, error, XMLNS,
- % [SubEl, Error]}
+ % IQ#iq{type = error,
+ % sub_el = [SubEl, Error]}
% end
% end;
% _ ->
- % {iq, ID, error, XMLNS,
- % [SubEl, ?ERR_NOT_ALLOWED]}
+ % IQ#iq{type = error,
+ % sub_el = [SubEl, ?ERR_NOT_ALLOWED]}
%end;
get ->
case process_get(SubEl) of
catch ets:new(disco_extra_domains, [named_table, ordered_set, public]),
ets:delete(disco_extra_domains, Domain).
-process_local_iq_items(From, To, #iq{type = Type, sub_el = SubEl} = IQ) ->
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
+process_local_iq_items(From, To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->
case Type of
set ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
get_local_items(["config"], Server, Lang) ->
{result,
- [?NODE("Host Name", "config/hostname"),
- ?NODE("ACLs", "config/acls"),
- ?NODE("Access Rules", "config/access"),
- ?NODE("Remove Users", "config/remusers")
+ [?NODE("Host Name", "config/hostname"),
+ ?NODE("Access Control Lists", "config/acls"),
+ ?NODE("Access Rules", "config/access"),
+ ?NODE("Remove Users", "config/remusers")
]};
get_local_items(["config", _], Server, Lang) ->
do_route(Host, From, To, Packet) ->
#jid{user = ChanServ, resource = Resource} = To,
+ {xmlelement, _Name, Attrs, _Els} = Packet,
case ChanServ of
"" ->
case Resource of
ejabberd_router:route(To,
From,
jlib:iq_to_xml(Res));
- #iq{type = Type, xmlns = ?NS_EJABBERD_CONFIG,
- sub_el = SubEl} = IQ ->
- ejabberd_config(From, To, IQ);
+ #iq{xmlns = ?NS_REGISTER} = IQ ->
+ process_register(From, To, IQ);
+ #iq{type = get, xmlns = ?NS_VCARD = XMLNS,
+ lang = Lang} = IQ ->
+ Res = IQ#iq{type = result,
+ sub_el =
+ [{xmlelement, "query",
+ [{"xmlns", XMLNS}],
+ iq_get_vcard(Lang)}]},
+ ejabberd_router:route(To,
+ From,
+ jlib:iq_to_xml(Res));
#iq{} = IQ ->
Err = jlib:make_error_reply(
Packet, ?ERR_FEATURE_NOT_IMPLEMENTED),
{xmlelement, "feature",
[{"var", ?NS_MUC}], []},
{xmlelement, "feature",
- [{"var", ?NS_EJABBERD_CONFIG}], []}].
-
-
-
-ejabberd_config(From, To, #iq{type = Type} = IQ) ->
- case catch process_ejabberd_config(From, To, IQ) of
+ [{"var", ?NS_REGISTER}], []},
+ {xmlelement, "feature",
+ [{"var", ?NS_VCARD}], []}].
+
+iq_get_vcard(Lang) ->
+ [{xmlelement, "FN", [],
+ [{xmlcdata, "ejabberd/mod_irc"}]},
+ {xmlelement, "URL", [],
+ [{xmlcdata,
+ "http://ejabberd.jabberstudio.org/"}]},
+ {xmlelement, "DESC", [],
+ [{xmlcdata, translate:translate(Lang, "ejabberd IRC module\n"
+ "Copyright (c) 2003-2004 Alexey Shchepin")}]}].
+
+process_register(From, To, #iq{} = IQ) ->
+ case catch process_irc_register(From, To, IQ) of
{'EXIT', Reason} ->
?ERROR_MSG("~p", [Reason]);
ResIQ ->
find_xdata_el1([_ | Els]) ->
find_xdata_el1(Els).
-process_ejabberd_config(From, To,
- #iq{type = Type, xmlns = XMLNS, sub_el = SubEl} = IQ) ->
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
+process_irc_register(From, To,
+ #iq{type = Type, xmlns = XMLNS,
+ lang = Lang, sub_el = SubEl} = IQ) ->
case Type of
set ->
XDataEl = find_xdata_el(SubEl),
{xmlelement, "x", [{"xmlns", ?NS_XDATA}],
[{xmlelement, "title", [],
[{xmlcdata,
- translate:translate(Lang, "mod_irc configuration for") ++
- " " ++ User ++ "@" ++ Server}]},
- %{xmlelement, "instructions", [],
- % [{xmlcdata,
- % translate:translate(
- % Lang, "")}]},
+ translate:translate(
+ Lang,
+ "Registration in mod_irc for ") ++ User ++ "@" ++ Server}]},
+ {xmlelement, "instructions", [],
+ [{xmlcdata,
+ translate:translate(
+ Lang,
+ "Enter username and encodings you wish to use for "
+ "connecting to IRC servers")}]},
{xmlelement, "field", [{"type", "text-single"},
{"label",
translate:translate(
[Host, From, To, IQ]);
#iq{type = get,
xmlns = ?NS_REGISTER = XMLNS,
+ lang = Lang,
sub_el = SubEl} = IQ ->
- Lang = xml:get_tag_attr_s(
- "xml:lang", SubEl),
Res = IQ#iq{type = result,
sub_el =
[{xmlelement, "query",
[{"xmlns", XMLNS}],
iq_get_register_info(
- From, Lang)}]},
+ From, Host, Lang)}]},
ejabberd_router:route(To,
From,
jlib:iq_to_xml(Res));
end;
#iq{type = get,
xmlns = ?NS_VCARD = XMLNS,
+ lang = Lang,
sub_el = SubEl} = IQ ->
- Lang = xml:get_tag_attr_s(
- "xml:lang", SubEl),
Res = IQ#iq{type = result,
sub_el =
[{xmlelement, "query",
{"var", Var}],
[{xmlelement, "value", [], [{xmlcdata, Val}]}]}).
-iq_get_register_info(From, Lang) ->
+iq_get_register_info(From, Host, Lang) ->
{LUser, LServer, _} = jlib:jid_tolower(From),
LUS = {LUser, LServer},
{Nick, Registered} = case catch mnesia:dirty_read(muc_registered, LUS) of
[{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
- Lang, "You need a x:data capable client to register.")}]},
+ Lang, "You need an x:data capable client to register nickname")}]},
{xmlelement, "x",
[{"xmlns", ?NS_XDATA}],
[{xmlelement, "title", [],
[{xmlcdata,
translate:translate(
- Lang, "Nickname Registration")}]},
+ Lang, "Nickname Registration at ") ++ Host}]},
{xmlelement, "instructions", [],
[{xmlcdata,
translate:translate(
- Lang, "Enter nickname you want to register.")}]},
+ Lang, "Enter nickname you want to register")}]},
?XFIELD("text-single", "Nickname", "nick", Nick)]}].
iq_set_register_info(From, XData) ->
"http://ejabberd.jabberstudio.org/"}]},
{xmlelement, "DESC", [],
[{xmlcdata, translate:translate(Lang, "ejabberd MUC module\n"
- "Copyright (c) 2003 Alexey Shchepin")}]}].
+ "Copyright (c) 2003-2004 Alexey Shchepin")}]}].
broadcast_service_message(Msg) ->
{next_state, normal_state, NewStateData2};
_ ->
Err = jlib:make_error_reply(
- Packet, ?ERR_NOT_ALLOWED),
+ Packet, ?ERR_FORBIDDEN),
ejabberd_router:route(
StateData#state.jid,
From, Err),
end;
true ->
Err = jlib:make_error_reply(
- Packet, ?ERR_NOT_ALLOWED),
+ Packet, ?ERR_FORBIDDEN),
ejabberd_router:route(
StateData#state.jid,
From, Err),
ok;
_ ->
Err = jlib:make_error_reply(
- Packet, ?ERR_NOT_ALLOWED),
+ Packet, ?ERR_NOT_ACCEPTABLE),
ejabberd_router:route(StateData#state.jid, From, Err)
end,
{next_state, normal_state, StateData}
{xmlelement, "iq", Attrs, Els} = Packet},
StateData) ->
case jlib:iq_query_info(Packet) of
- #iq{type = Type, xmlns = XMLNS, sub_el = SubEl} = IQ when
+ #iq{type = Type, xmlns = XMLNS, lang = Lang, sub_el = SubEl} = IQ when
(XMLNS == ?NS_MUC_ADMIN) or
(XMLNS == ?NS_MUC_OWNER) or
(XMLNS == ?NS_DISCO_INFO) or
(XMLNS == ?NS_DISCO_ITEMS) ->
Res1 = case XMLNS of
?NS_MUC_ADMIN ->
- process_iq_admin(From, Type, SubEl, StateData);
+ process_iq_admin(From, Type, Lang, SubEl, StateData);
?NS_MUC_OWNER ->
- process_iq_owner(From, Type, SubEl, StateData);
+ process_iq_owner(From, Type, Lang, SubEl, StateData);
?NS_DISCO_INFO ->
- process_iq_disco_info(From, Type, StateData);
+ process_iq_disco_info(From, Type, Lang, StateData);
?NS_DISCO_ITEMS ->
- process_iq_disco_items(From, Type, StateData)
+ process_iq_disco_items(From, Type, Lang, StateData)
end,
{IQRes, NewStateData} =
case Res1 of
true ->
ok;
_ ->
- send_subject(From, StateData)
+ Lang = xml:get_attr_s("xml:lang", Attrs),
+ send_subject(From, Lang, StateData)
end,
- send_join_messages_end(From, StateData),
NewState;
_ ->
Err = jlib:make_error_reply(
end, false, lists:nthtail(Shift, lqueue_to_list(StateData#state.history))).
-send_subject(JID, StateData) ->
+send_subject(JID, Lang, StateData) ->
case StateData#state.subject_author of
"" ->
ok;
[{xmlelement, "subject", [], [{xmlcdata, Subject}]},
{xmlelement, "body", [],
[{xmlcdata,
- Nick ++ " has set the topic to: " ++ Subject}]}]},
+ Nick ++
+ translate:translate(Lang,
+ " has set the subject to: ") ++
+ Subject}]}]},
ejabberd_router:route(
StateData#state.jid,
JID,
xml:get_tag_cdata(SubjEl)
end.
-send_join_messages_end(JID, StateData) ->
- Packet = {xmlelement, "message", [{"type", "groupchat"}],
- [{xmlelement, "body", [],
- [{xmlcdata, "-"}]}]},
- ejabberd_router:route(
- StateData#state.jid,
- JID,
- Packet).
-
can_change_subject(Role, StateData) ->
case (StateData#state.config)#config.allow_change_subj of
true ->
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Admin stuff
-process_iq_admin(From, set, SubEl, StateData) ->
+process_iq_admin(From, set, Lang, SubEl, StateData) ->
{xmlelement, _, _, Items} = SubEl,
process_admin_items_set(From, Items, StateData);
-process_iq_admin(From, get, SubEl, StateData) ->
+process_iq_admin(From, get, Lang, SubEl, StateData) ->
case xml:get_subtag(SubEl, "item") of
false ->
{error, ?ERR_BAD_REQUEST};
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Owner stuff
-process_iq_owner(From, set, SubEl, StateData) ->
+process_iq_owner(From, set, Lang, SubEl, StateData) ->
FAffiliation = get_affiliation(From, StateData),
case FAffiliation of
owner ->
{xmlelement, Name, Attrs, Els} = SubEl,
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
case xml:remove_cdata(Els) of
[{xmlelement, "x", Attrs1, Els1} = XEl] ->
case {xml:get_tag_attr_s("xmlns", XEl),
{error, ?ERR_FORBIDDEN}
end;
-process_iq_owner(From, get, SubEl, StateData) ->
+process_iq_owner(From, get, Lang, SubEl, StateData) ->
FAffiliation = get_affiliation(From, StateData),
case FAffiliation of
owner ->
{xmlelement, Name, Attrs, Els} = SubEl,
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
case xml:remove_cdata(Els) of
[] ->
get_config(Lang, StateData);
get_config(Lang, StateData) ->
Config = StateData#state.config,
Res =
- [?STRINGXFIELD("Room title",
+ [{xmlelement, "title", [],
+ [{xmlcdata, translate:translate(Lang, "Configuration for ") ++
+ jlib:jid_to_string(StateData#state.jid)}]},
+ ?STRINGXFIELD("Room title",
"title",
Config#config.title),
?BOOLXFIELD("Allow users to change subject?",
"logging",
Config#config.logging)
],
- {result, [{xmlelement, "x", [{"xmlns", ?NS_XDATA}], Res}], StateData}.
+ {result, [{xmlelement, "instructions", [],
+ [{xmlcdata,
+ translate:translate(
+ Lang, "You need an x:data capable client to configure room")}]},
+ {xmlelement, "x", [{"xmlns", ?NS_XDATA}], Res}], StateData}.
?FEATURE(Fiffalse)
end).
-process_iq_disco_info(From, set, StateData) ->
+process_iq_disco_info(From, set, Lang, StateData) ->
{error, ?ERR_NOT_ALLOWED};
-process_iq_disco_info(From, get, StateData) ->
+process_iq_disco_info(From, get, Lang, StateData) ->
Config = StateData#state.config,
{result, [{xmlelement, "identity",
[{"category", "conference"},
], StateData}.
-process_iq_disco_items(From, set, StateData) ->
+process_iq_disco_items(From, set, Lang, StateData) ->
{error, ?ERR_NOT_ALLOWED};
-process_iq_disco_items(From, get, StateData) ->
+process_iq_disco_items(From, get, Lang, StateData) ->
FAffiliation = get_affiliation(From, StateData),
FRole = get_role(From, StateData),
case ((StateData#state.config)#config.public_list == true) orelse
Packet, Error)
end,
ejabberd_router:route(To, From, Res);
- %{iq, ID, get, ?NS_REGISTER = XMLNS, SubEl} ->
- % Lang = xml:get_tag_attr_s(
- % "xml:lang", SubEl),
- % Res = {iq, ID, result, XMLNS,
- % [{xmlelement, "query",
- % [{"xmlns", XMLNS}],
- % iq_get_register_info(
- % From, Lang)}]},
+ %#iq{type = get, xmlns = ?NS_REGISTER = XMLNS,
+ % lang = Lang, sub_el = SubEl} = IQ ->
+ % Res = IQ#iq{type = result,
+ % sub_el = [{xmlelement, "query",
+ % [{"xmlns", XMLNS}],
+ % iq_get_register_info(
+ % From, Lang)}]},
% ejabberd_router:route(To,
% From,
% jlib:iq_to_xml(Res));
- %{iq, ID, set, ?NS_REGISTER = XMLNS, SubEl} ->
+ %#iq{type = set, xmlns = ?NS_REGISTER = XMLNS,
+ % sub_el = SubEl} = IQ ->
% case process_iq_register_set(From, SubEl) of
% {result, IQRes} ->
- % Res = {iq, ID, result, XMLNS,
- % [{xmlelement, "query",
- % [{"xmlns", XMLNS}],
- % IQRes}]},
+ % Res = IQ#iq{type = result,
+ % sub_el = [{xmlelement, "query",
+ % [{"xmlns", XMLNS}],
+ % IQRes}]},
% ejabberd_router:route(
% To, From, jlib:iq_to_xml(Res));
% {error, Error} ->
end,
ejabberd_router:route(To, From, Res);
#iq{type = get, xmlns = ?NS_VCARD = XMLNS,
- sub_el = SubEl} = IQ ->
- Lang = xml:get_tag_attr_s(
- "xml:lang", SubEl),
+ lang = Lang, sub_el = SubEl} = IQ ->
Res = IQ#iq{type = result,
sub_el = [{xmlelement, "query",
[{"xmlns", XMLNS}],
[{xmlcdata,
"http://ejabberd.jabberstudio.org/"}]},
{xmlelement, "DESC", [],
- [{xmlcdata, "ejabberd pub/sub module\n"
- "Copyright (c) 2003 Alexey Shchepin"}]}].
+ [{xmlcdata, translate:translate(
+ Lang,
+ "ejabberd pub/sub module\n"
+ "Copyright (c) 2003-2004 Alexey Shchepin")}]}].
iq_pubsub(Host, From, Type, SubEl) ->
init() ->
ok.
-process_iq(From, _To, #iq{type = Type, sub_el = SubEl} = IQ) ->
+process_iq(From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->
case Type of
set ->
UTag = xml:get_subtag(SubEl, "username"),
sub_el = [SubEl, ?ERR_BAD_REQUEST]}
end;
get ->
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
IQ#iq{type = result,
sub_el = [{xmlelement,
"query",
translate:translate(
Lang,
"Choose a username and password "
- "to register with this server.")}]},
+ "to register with this server")}]},
{xmlelement, "username", [], []},
{xmlelement, "password", [], []}]}]}
end.
end.
-process_local_iq(_From, _To, #iq{type = Type, sub_el = SubEl} = IQ) ->
+process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ) ->
case Type of
set ->
IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
[{xmlcdata,
"http://ejabberd.jabberstudio.org/"}]},
{xmlelement, "DESC", [],
- [{xmlcdata, "Erlang Jabber Server\n"
- "Copyright (c) 2002-2004 Alexey Shchepin"}]},
+ [{xmlcdata,
+ translate:translate(
+ Lang,
+ "Erlang Jabber Server\n"
+ "Copyright (c) 2002-2004 Alexey Shchepin")}]},
{xmlelement, "BDAY", [],
[{xmlcdata, "2002-11-16"}]}
]}]}
{"var", Var}], []}).
--define(FORM,
+-define(FORM(JID),
[{xmlelement, "instructions", [],
- [{xmlcdata, translate:translate(Lang, "You need a x:data capable client to search")}]},
+ [{xmlcdata, translate:translate(Lang, "You need an x:data capable client to search")}]},
{xmlelement, "x", [{"xmlns", ?NS_XDATA}, {"type", "form"}],
[{xmlelement, "title", [],
- [{xmlcdata, translate:translate(Lang, "Users Search")}]},
+ [{xmlcdata, translate:translate(Lang, "Search users in ") ++
+ jlib:jid_to_string(JID)}]},
{xmlelement, "instructions", [],
[{xmlcdata, translate:translate(Lang, "Fill in fields to search "
"for any matching Jabber User")}]},
true ->
IQ = jlib:iq_query_info(Packet),
case IQ of
- #iq{type = Type, xmlns = ?NS_SEARCH, sub_el = SubEl} ->
- Lang = xml:get_tag_attr_s("xml:lang", SubEl),
+ #iq{type = Type, xmlns = ?NS_SEARCH, lang = Lang, sub_el = SubEl} ->
case Type of
set ->
XDataEl = find_xdata_el(SubEl),
[{xmlelement, "x",
[{"xmlns", ?NS_XDATA},
{"type", "result"}],
- search_result(Lang, XData)
+ search_result(Lang, To, XData)
}]}]},
ejabberd_router:route(
To, From, jlib:iq_to_xml(ResIQ))
sub_el = [{xmlelement,
"query",
[{"xmlns", ?NS_SEARCH}],
- ?FORM
+ ?FORM(To)
}]},
ejabberd_router:route(To,
From,
"vCard User Search"}],
[]},
{xmlelement, "feature",
- [{"var", ?NS_SEARCH}], []}
+ [{"var", ?NS_SEARCH}], []},
+ {xmlelement, "feature",
+ [{"var", ?NS_VCARD}], []}
]
}]},
ejabberd_router:route(To,
From,
jlib:iq_to_xml(ResIQ))
end;
+ #iq{type = get, xmlns = ?NS_VCARD, lang = Lang} ->
+ ResIQ =
+ IQ#iq{type = result,
+ sub_el = [{xmlelement,
+ "query",
+ [{"xmlns", ?NS_VCARD}],
+ iq_get_vcard(Lang)}]},
+ ejabberd_router:route(To,
+ From,
+ jlib:iq_to_xml(ResIQ));
_ ->
Err = jlib:make_error_reply(Packet,
?ERR_SERVICE_UNAVAILABLE),
end
end.
+iq_get_vcard(Lang) ->
+ [{xmlelement, "FN", [],
+ [{xmlcdata, "ejabberd/mod_vcard"}]},
+ {xmlelement, "URL", [],
+ [{xmlcdata,
+ "http://ejabberd.jabberstudio.org/"}]},
+ {xmlelement, "DESC", [],
+ [{xmlcdata, translate:translate(Lang, "ejabberd vCard module\n"
+ "Copyright (c) 2003-2004 Alexey Shchepin")}]}].
+
find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
find_xdata_el1(SubEls).
{xmlelement, "field", [{"label", translate:translate(Lang, Label)},
{"var", Var}], []}).
-search_result(Lang, Data) ->
+search_result(Lang, JID, Data) ->
[{xmlelement, "title", [],
- [{xmlcdata, translate:translate(Lang, "Users Search Results")}]},
+ [{xmlcdata, translate:translate(Lang, "Results of search in ") ++
+ jlib:jid_to_string(JID)}]},
{xmlelement, "reported", [],
[?LFIELD("JID", "jid"),
?LFIELD("Full Name", "fn"),
% $Id$
% mod_configure.erl
-{"DB Tables Configuration", "Конфигурация таблиц БД"}.
+{"DB Tables Configuration at ", "Конфигурация таблиц БД на "}.
{"Choose storage type of tables", "Выберите тип хранения таблиц"}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
-{"", ""}.
+{"RAM copy", "ОЗУ"}.
+{"RAM and disc copy", "ОЗУ и диск"}.
+{"Disc only copy", "только диск"}.
+{"Remote copy", "не хранится локально"}.
+{"Stop Modules at ", "Остановка модулей на "}.
+{"Choose modules to stop", "Выберите модули, которые следует остановить"}.
+{"Start Modules at ", "Запуск модулей на "}.
+{"Enter list of {Module, [Options]}", "Введите список вида {Module, [Options]}"}.
+{"List of modules to start", "Список запускаемых модулей"}.
+{"Backup to File at ", "Резервное копирование в файл на "}.
+{"Enter path to backup file", "Введите путь к резервному файлу"}.
+{"Path to File", "Путь к файлу"}.
+{"Restore Backup from File at ", "Восстановление из резервной копии на "}.
+{"Dump Backup to Text File at ", "Копирование в текстовый файл на "}.
+{"Enter path to text file", "Введите путь к текстовому файлу"}.
+{"Import User from File at ", "Импорт пользователя из файла на "}.
+{"Enter path to jabberd1.4 spool file", "Введите путь к файлу из спула jabberd1.4"}.
+{"Import Users from Dir at ", "Импорт пользователей из директории на "}.
+{"Enter path to jabberd1.4 spool dir", "Введите путь к директории спула jabberd1.4"}.
+{"Path to Dir", "Путь к директории"}.
+{"Hostname Configuration", "Конфигурация имени хоста"}.
+{"Choose host name", "Выберите имя хоста"}.
+{"Host name", "Имя хоста"}.
+{"Access Control List Configuration", "Конфигурация списков управления доступом"}.
+{"Access control lists", "Списки управления доступом"}.
+{"Access Configuration", "Конфигурация доступа"}.
+{"Access rules", "Правила доступа"}.
+{"Remove Users", "Удаление пользователей"}.
+{"Choose users to remove", "Выберите пользователей, которых следует удалить"}.
+{"Administration of ", "Администрирование "}.
+{"Action on user", "Действие над пользователем"}.
+{"Edit Properties", "Изменить параметры"}.
+{"Remove User", "Удалить пользователя"}.
% mod_disco.erl
{"Configuration", "Конфигурация"}.
{"Running Nodes", "Работающие узлы"}.
{"Stopped Nodes", "Остановленные узлы"}.
{"Host Name", "Имя хоста"}.
-{"ACLs", "ACLs"}.
+{"Access Control Lists", "Списки управления доступом"}.
{"Access Rules", "Правила доступа"}.
{"Remove Users", "Удаление пользователей"}.
{"DB", "БД"}.
{"Modules", "Модули"}.
{"Start Modules", "Запуск модулей"}.
{"Stop Modules", "Остановка модулей"}.
+{"Backup Management", "Управление резервным копированием"}.
+{"Import users from jabberd1.4 spool files", "Импорт пользователей из спула jabberd1.4"}.
+{"Backup", "Резервное копирование"}.
+{"Restore", "Восстановление из резервной копии"}.
+{"Dump to Text File", "Копирование в текстовый файл"}.
+{"Import File", "Импорт из файла"}.
+{"Import Directory", "Импорт из директории"}.
% mod_register.erl
-{"Choose a username and password to register with this server.",
- "Ð\92Ñ\8bбеÑ\80иÑ\82е иденÑ\82иÑ\84икаÑ\82оÑ\80 полÑ\8cзоваÑ\82елÑ\8f и паÑ\80олÑ\8c длÑ\8f Ñ\80егиÑ\81Ñ\82Ñ\80аÑ\86ии на Ñ\8dÑ\82ом Ñ\81еÑ\80веÑ\80е."}.
+{"Choose a username and password to register with this server",
+ "Ð\92Ñ\8bбеÑ\80иÑ\82е имÑ\8f полÑ\8cзоваÑ\82елÑ\8f и паÑ\80олÑ\8c длÑ\8f Ñ\80егиÑ\81Ñ\82Ñ\80аÑ\86ии на Ñ\8dÑ\82ом Ñ\81еÑ\80веÑ\80е"}.
% mod_vcard.erl
-{"You need a x:data capable client to search",
- "Чтобы воспользоваться поиском, Вам нужен x:data-совместимый клиент"}.
-{"Users Search", "Поиск пользователей"}.
+{"Erlang Jabber Server\nCopyright (c) 2002-2004 Alexey Shchepin",
+ "Erlang Jabber Server\nCopyright (c) 2002-2004 Алексей Щепин"}.
+{"ejabberd vCard module\nCopyright (c) 2003-2004 Alexey Shchepin",
+ "ejabberd vCard модуль\nCopyright (c) 2003-2004 Алексей Щепин"}.
+{"You need an x:data capable client to search",
+ "Чтобы воспользоваться поиском, требуется x:data-совместимый клиент"}.
+{"Search users in ", "Поиск пользователей в "}.
{"Fill in fields to search for any matching Jabber User",
"Заполните поля для поиска пользователя Jabber"}.
-{"Users Search Results", "Результат поиска пользователей"}.
+{"Results of search in ", "Результаты поиска в "}.
{"User", "Пользователь"}.
{"Full Name", "Полное имя"}.
{"Organization Name", "Название организации"}.
{"Organization Unit", "Отдел организации"}.
+% mod_pubsub/mod_pubsub.erl
+{"ejabberd pub/sub module\nCopyright (c) 2003-2004 Alexey Shchepin",
+ "ejabberd pub/sub модуль\nCopyright (c) 2003-2004 Алексей Щепин"}.
+
% mod_muc/mod_muc.erl
-{"Nickname Registration", "Регистрация псевдонима"}.
-{"Enter nickname you want to register.", "Введите псевдоним, который вы хотели бы зарегистрировать"}.
-{"ejabberd MUC module\nCopyright (c) 2003 Alexey Shchepin",
- "ejabberd MUC модуль\nCopyright (c) 2003 Алексей Щепин"}.
+{"You need an x:data capable client to register nickname",
+ "Чтобы зарегистрировать псевдоним, требуется x:data-совместимый клиент"}.
+{"Nickname Registration at ", "Регистрация псевдонима на "}.
+{"Enter nickname you want to register", "Введите псевдоним, который Вы хотели бы зарегистрировать"}.
+{"ejabberd MUC module\nCopyright (c) 2003-2004 Alexey Shchepin",
+ "ejabberd MUC модуль\nCopyright (c) 2003-2004 Алексей Щепин"}.
% mod_muc/mod_muc_room.erl
+{" has set the subject to: ", " установил(а) тему: "}.
+{"You need an x:data capable client to configure room",
+ "Чтобы сконфигурировать комнату, требуется x:data-совместимый клиент"}.
+{"Configuration for ", "Конфигурация "}.
{"Room title", "Название комнаты"}.
{"Allow users to change subject?", "Разрешить пользователям изменять тему?"}.
{"Allow users to query other users?",
{"Allow users to send invites?",
"Разрешить пользователям посылать приглашения?"}.
{"Make room password protected?", "Сделать комнату защищённой паролем?"}.
+{"Password", "Пароль"}.
{"Make room anonymous?", "Сделать комнату анонимной?"}.
{"Enable logging?", "Включить журналирование?"}.
% mod_irc/mod_irc.erl
+{"ejabberd IRC module\nCopyright (c) 2003-2004 Alexey Shchepin",
+ "ejabberd IRC модуль\nCopyright (c) 2003-2004 Алексей Щепин"}.
{"You need an x:data capable client to configure mod_irc settings",
- "Чтобы настроить параметры mod_irc, нужен x:data-совместимый клиент"}.
-{"mod_irc configuration for", "Конфигурация mod_irc для"}.
+ "Чтобы настроить параметры mod_irc, требуется x:data-совместимый клиент"}.
+{"Registration in mod_irc for ", "Регистрация в mod_irc для "}.
+{"Enter username and encodings you wish to use for connecting to IRC servers",
+ "Введите имя пользователя и кодировки, которые будут использоваться при подключении к IRC-серверам"}.
{"IRC Username", "Имя пользователя IRC"}.
{"If you want to specify different encodings for IRC servers, fill this list with values in format '{\"irc server\", \"encoding\"}'. By default this service use \"~s\" encoding.", "Чтобы указать различные кодировки для разных серверов IRC, заполните список значениями в формате '{\"irc server\", \"encoding\"}'. По умолчанию эта служба использует кодировку \"~s\"."}.
{"Example: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}].", "Примеры: [{\"irc.lucky.net\", \"koi8-r\"}, {\"vendetta.fef.net\", \"iso8859-1\"}]."}.
projects / ejabberd / commitdiff