Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-14 22:00:16 +02:00
Code Releases Activity

* src/mod_irc/mod_irc_connection.erl: Added filtering of quit

Browse Source 
status

* src/web/ejabberd_web_admin.erl: Copyright update
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise

SVN Revision: 296
This commit is contained in:
Alexey Shchepin 2005-01-13 23:04:47 +00:00
parent 3416cbe63a
commit 36afafb9e6
8 changed files with 47 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2005-01-14 Alexey Shchepin <alexey@sevcom.net>
* src/mod_irc/mod_irc_connection.erl: Added filtering of quit
status
2005-01-04 Alexey Shchepin <alexey@sevcom.net>
* src/web/ejabberd_web_admin.erl: Copyright update
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_irc/mod_irc.erl: Likewise
2004-12-30 Alexey Shchepin <alexey@sevcom.net> 2004-12-30 Alexey Shchepin <alexey@sevcom.net>
* src/odbc/ejabberd_odbc.erl: Load-balance ODBC requests between * src/odbc/ejabberd_odbc.erl: Load-balance ODBC requests between

2
src/mod_irc/mod_irc.erl
View File

@ -199,7 +199,7 @@ iq_get_vcard(Lang) ->
"http://ejabberd.jabberstudio.org/"}]}, "http://ejabberd.jabberstudio.org/"}]},
{xmlelement, "DESC", [], {xmlelement, "DESC", [],
[{xmlcdata, translate:translate(Lang, "ejabberd IRC module\n" [{xmlcdata, translate:translate(Lang, "ejabberd IRC module\n"
"Copyright (c) 2003-2004 Alexey Shchepin")}]}]. "Copyright (c) 2003-2005 Alexey Shchepin")}]}].
process_register(From, To, #iq{} = IQ) -> process_register(From, To, #iq{} = IQ) ->
case catch process_irc_register(From, To, IQ) of case catch process_irc_register(From, To, IQ) of

94
src/mod_irc/mod_irc_connection.erl
View File

@ -614,16 +614,7 @@ process_channel_list_user(StateData, Chan, User) ->
process_channel_topic(StateData, Chan, String) -> process_channel_topic(StateData, Chan, String) ->
FromUser = "someone", FromUser = "someone",
{ok, Msg, _} = regexp:sub(String, ".*332[^:]*:", ""), {ok, Msg, _} = regexp:sub(String, ".*332[^:]*:", ""),
Msg1 = lists:filter( Msg1 = filter_message(Msg),
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid( jlib:make_jid(
lists:concat([Chan, "%", StateData#state.server]), lists:concat([Chan, "%", StateData#state.server]),
@ -642,16 +633,7 @@ process_chanprivmsg(StateData, Chan, From, String) ->
_ -> _ ->
Msg Msg
end, end,
Msg2 = lists:filter( Msg2 = filter_message(Msg1),
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg1),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]),
StateData#state.myname, FromUser), StateData#state.myname, FromUser),
@ -670,16 +652,7 @@ process_channotice(StateData, Chan, From, String) ->
_ -> _ ->
Msg Msg
end, end,
Msg2 = lists:filter( Msg2 = filter_message(Msg1),
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg1),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]),
StateData#state.myname, FromUser), StateData#state.myname, FromUser),
@ -699,16 +672,7 @@ process_privmsg(StateData, Nick, From, String) ->
_ -> _ ->
Msg Msg
end, end,
Msg2 = lists:filter( Msg2 = filter_message(Msg1),
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg1),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([FromUser, "!", StateData#state.server]), jlib:make_jid(lists:concat([FromUser, "!", StateData#state.server]),
StateData#state.myname, ""), StateData#state.myname, ""),
@ -726,16 +690,7 @@ process_notice(StateData, Nick, From, String) ->
_ -> _ ->
Msg Msg
end, end,
Msg2 = lists:filter( Msg2 = filter_message(Msg1),
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg1),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([FromUser, "!", StateData#state.server]), jlib:make_jid(lists:concat([FromUser, "!", StateData#state.server]),
StateData#state.myname, ""), StateData#state.myname, ""),
@ -761,16 +716,7 @@ process_version(StateData, Nick, From) ->
process_topic(StateData, Chan, From, String) -> process_topic(StateData, Chan, From, String) ->
[FromUser | _] = string:tokens(From, "!"), [FromUser | _] = string:tokens(From, "!"),
{ok, Msg, _} = regexp:sub(String, ".*TOPIC[^:]*:", ""), {ok, Msg, _} = regexp:sub(String, ".*TOPIC[^:]*:", ""),
Msg1 = lists:filter( Msg1 = filter_message(Msg),
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]),
StateData#state.myname, FromUser), StateData#state.myname, FromUser),
@ -784,6 +730,7 @@ process_topic(StateData, Chan, From, String) ->
process_part(StateData, Chan, From, String) -> process_part(StateData, Chan, From, String) ->
[FromUser | FromIdent] = string:tokens(From, "!"), [FromUser | FromIdent] = string:tokens(From, "!"),
{ok, Msg, _} = regexp:sub(String, ".*PART[^:]*", ""), {ok, Msg, _} = regexp:sub(String, ".*PART[^:]*", ""),
Msg1 = filter_message(Msg),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]),
StateData#state.myname, FromUser), StateData#state.myname, FromUser),
@ -791,7 +738,7 @@ process_part(StateData, Chan, From, String) ->
{xmlelement, "message", [{"type", "groupchat"}], {xmlelement, "message", [{"type", "groupchat"}],
[{xmlelement, "body", [], [{xmlelement, "body", [],
[{xmlcdata, "/me has part: " ++ [{xmlcdata, "/me has part: " ++
Msg ++ "(" ++ FromIdent ++ ")" }]}]}), Msg1 ++ "(" ++ FromIdent ++ ")" }]}]}),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]),
@ -804,7 +751,7 @@ process_part(StateData, Chan, From, String) ->
{"role", "none"}], {"role", "none"}],
[]}]}, []}]},
{xmlelement, "status", [], {xmlelement, "status", [],
[{xmlcdata, Msg ++ "(" ++ FromIdent ++ ")"}]}] [{xmlcdata, Msg1 ++ "(" ++ FromIdent ++ ")"}]}]
}), }),
case catch dict:update(Chan, case catch dict:update(Chan,
fun(Ps) -> fun(Ps) ->
@ -821,6 +768,7 @@ process_quit(StateData, From, String) ->
[FromUser | FromIdent] = string:tokens(From, "!"), [FromUser | FromIdent] = string:tokens(From, "!"),
{ok, Msg, _} = regexp:sub(String, ".*QUIT[^:]*:", ""), {ok, Msg, _} = regexp:sub(String, ".*QUIT[^:]*:", ""),
Msg1 = filter_message(Msg),
NewChans = NewChans =
dict:map( dict:map(
fun(Chan, Ps) -> fun(Chan, Ps) ->
@ -834,7 +782,7 @@ process_quit(StateData, From, String) ->
{xmlelement, "message", [{"type", "groupchat"}], {xmlelement, "message", [{"type", "groupchat"}],
[{xmlelement, "body", [], [{xmlelement, "body", [],
[{xmlcdata, "/me has quit: " ++ [{xmlcdata, "/me has quit: " ++
Msg ++ "(" ++ FromIdent ++ ")" }]}]}), Msg1 ++ "(" ++ FromIdent ++ ")" }]}]}),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid( jlib:make_jid(
@ -848,7 +796,7 @@ process_quit(StateData, From, String) ->
{"role", "none"}], {"role", "none"}],
[]}]}, []}]},
{xmlelement, "status", [], {xmlelement, "status", [],
[{xmlcdata, Msg ++ "(" ++ FromIdent ++ ")"}]} [{xmlcdata, Msg1 ++ "(" ++ FromIdent ++ ")"}]}
]}), ]}),
remove_element(FromUser, Ps); remove_element(FromUser, Ps);
_ -> _ ->
@ -874,6 +822,7 @@ process_join(StateData, Channel, From, String) ->
{xmlelement, "status", [], {xmlelement, "status", [],
[{xmlcdata, FromIdent}]}]}), [{xmlcdata, FromIdent}]}]}),
{ok, Msg, _} = regexp:sub(String, ".*JOIN[^:]*:", ""), {ok, Msg, _} = regexp:sub(String, ".*JOIN[^:]*:", ""),
Msg1 = filter_message(Msg),
ejabberd_router:route( ejabberd_router:route(
jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]), jlib:make_jid(lists:concat([Chan, "%", StateData#state.server]),
StateData#state.myname, FromUser), StateData#state.myname, FromUser),
@ -881,7 +830,7 @@ process_join(StateData, Channel, From, String) ->
{xmlelement, "message", [{"type", "groupchat"}], {xmlelement, "message", [{"type", "groupchat"}],
[{xmlelement, "body", [], [{xmlelement, "body", [],
[{xmlcdata, "/me has joined " ++ [{xmlcdata, "/me has joined " ++
Msg ++ "(" ++ FromIdent ++ ")" }]}]}), Msg1 ++ "(" ++ FromIdent ++ ")" }]}]}),
case catch dict:update(Chan, case catch dict:update(Chan,
fun(Ps) -> fun(Ps) ->
@ -1058,7 +1007,14 @@ process_admin(StateData, Channel, Nick, Affiliation, Role, Reason) ->
filter_message(Msg) ->
lists:filter(
fun(C) ->
if (C < 32) and
(C /= 9) and
(C /= 10) and
(C /= 13) ->
false;
true -> true
end
end, Msg).

2
src/mod_muc/mod_muc.erl
View File

@ -444,7 +444,7 @@ iq_get_vcard(Lang) ->
"http://ejabberd.jabberstudio.org/"}]}, "http://ejabberd.jabberstudio.org/"}]},
{xmlelement, "DESC", [], {xmlelement, "DESC", [],
[{xmlcdata, translate:translate(Lang, "ejabberd MUC module\n" [{xmlcdata, translate:translate(Lang, "ejabberd MUC module\n"
"Copyright (c) 2003-2004 Alexey Shchepin")}]}]. "Copyright (c) 2003-2005 Alexey Shchepin")}]}].
broadcast_service_message(Msg) -> broadcast_service_message(Msg) ->

2
src/mod_pubsub/mod_pubsub.erl
View File

@ -390,7 +390,7 @@ iq_get_vcard(Lang) ->
[{xmlcdata, translate:translate( [{xmlcdata, translate:translate(
Lang, Lang,
"ejabberd pub/sub module\n" "ejabberd pub/sub module\n"
"Copyright (c) 2003-2004 Alexey Shchepin")}]}]. "Copyright (c) 2003-2005 Alexey Shchepin")}]}].
iq_pubsub(Host, From, Type, SubEl) -> iq_pubsub(Host, From, Type, SubEl) ->

4
src/mod_vcard.erl
View File

@ -126,7 +126,7 @@ process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ)
translate:translate( translate:translate(
Lang, Lang,
"Erlang Jabber Server\n" "Erlang Jabber Server\n"
"Copyright (c) 2002-2004 Alexey Shchepin")}]}, "Copyright (c) 2002-2005 Alexey Shchepin")}]},
{xmlelement, "BDAY", [], {xmlelement, "BDAY", [],
[{xmlcdata, "2002-11-16"}]} [{xmlcdata, "2002-11-16"}]}
]}]} ]}]}
@ -390,7 +390,7 @@ iq_get_vcard(Lang) ->
[{xmlcdata, translate:translate( [{xmlcdata, translate:translate(
Lang, Lang,
"ejabberd vCard module\n" "ejabberd vCard module\n"
"Copyright (c) 2003-2004 Alexey Shchepin")}]}]. "Copyright (c) 2003-2005 Alexey Shchepin")}]}].
find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) -> find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
find_xdata_el1(SubEls). find_xdata_el1(SubEls).

4
src/mod_vcard_ldap.erl
View File

@ -86,7 +86,7 @@ process_local_iq(_From, _To, #iq{type = Type, lang = Lang, sub_el = SubEl} = IQ)
translate:translate( translate:translate(
Lang, Lang,
"Erlang Jabber Server\n" "Erlang Jabber Server\n"
"Copyright (c) 2002-2004 Alexey Shchepin")}]}, "Copyright (c) 2002-2005 Alexey Shchepin")}]},
{xmlelement, "BDAY", [], {xmlelement, "BDAY", [],
[{xmlcdata, "2002-11-16"}]} [{xmlcdata, "2002-11-16"}]}
]}]} ]}]}
@ -361,7 +361,7 @@ iq_get_vcard(Lang) ->
[{xmlcdata, translate:translate( [{xmlcdata, translate:translate(
Lang, Lang,
"ejabberd vCard module\n" "ejabberd vCard module\n"
"Copyright (c) 2003-2004 Alexey Shchepin")}]}]. "Copyright (c) 2003-2005 Alexey Shchepin")}]}].
find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) -> find_xdata_el({xmlelement, _Name, _Attrs, SubEls}) ->
find_xdata_el1(SubEls). find_xdata_el1(SubEls).

2
src/web/ejabberd_web_admin.erl
View File

@ -119,7 +119,7 @@ make_xhtml(Els, Lang) ->
[?XE("tbody", [?XE("tbody",
[?XE("tr", [?XE("tr",
[?XCT("td", [?XCT("td",
"ejabberd (c) 2002-2004 Alexey Shchepin, 2004 Process One") "ejabberd (c) 2002-2005 Alexey Shchepin, 2004 Process One")
])]) ])])
])])])])])]) ])])])])])])
]}}. ]}}.