Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-06 15:37:52 +01:00
Code Releases Activity
3,010 Commits 7 Branches 109 Tags 65 MiB
cfe396e155
Commit Graph

220 Commits

Author SHA1 Message Date
Pablo Polvorin
3ae4797848 Command to moderate short term muc history (part of EJABS-1733) 
ejabberdctl moderate_room_history test@conference.domain.com nick

removes from short term storage all messages on
room test@conference.domain.com from nick "nick", so new user
joining the room don't get these ones.

Return the number of messages removed.
 2011-09-19 15:43:20 -03:00
Evgeniy Khramtsov
8f27a697c0 Only use hash route-balancing when MUC is broadcasted 2011-09-15 08:52:22 +10:00
Evgeniy Khramtsov
c9a712a16a Implement MUC rooms load distribution (TECH-1351). 
Configuration example:
{domain_balancing, "conference.domain.com", broadcast}.
NOTE: both ejabberd_router and mod_muc use the option.
 2011-09-14 17:43:07 +10:00
Evgeniy Khramtsov
228a587fc5 Fix previous commit 2011-09-09 12:40:07 +10:00
Evgeniy Khramtsov
e432ff58f9 Avoid crash when performing admin action 2011-09-09 12:34:06 +10:00
Badlop
b8969f68e0 Fixed support for multi-resource occupants (EJAB-305) 2011-09-08 16:10:38 +02:00
Evgeniy Khramtsov
f3c90ee266 Get rid of useless check 2011-09-05 21:06:18 +10:00
Evgeniy Khramtsov
2482c9c5ed Merge set_affiliation/3 and set_affiliation_and_reason/4 into set_affiliation/4 2011-09-05 20:53:01 +10:00
Evgeniy Khramtsov
eccb499346 Add some magic in order to shut up the dialyzer (because I do not want to replace the macro with a function) 2011-09-05 17:33:51 +10:00
Evgeniy Khramtsov
0c1796ea40 Fix potential case-clause crash 2011-09-05 17:27:15 +10:00
Badlop
41d028d101 First check occupant existence, later check the message 2011-09-04 13:28:32 +02:00
Badlop
dd772404c5 Merge branch '2.1.x' into 2.2.x 
Conflicts:
	src/configure
	src/ejabberd.app
	src/ejabberd_auth_anonymous.erl
	src/ejabberd_c2s.erl
	src/ejabberd_sm.erl
 2011-08-24 18:29:25 +02:00
Badlop
84486dcb2c Support multiple sessions per nick in muc_online_users, relevant for max_user_conferences (EJAB-305) 2011-08-23 21:53:41 +02:00
Badlop
9a190f3bc4 Send private messages to all the sessions with same nick (EJAB-305) 2011-08-23 21:53:30 +02:00
Badlop
c76bbdf16f Don't send unavailable presence when leaving occupant has other nicks in the room (EJAB-305) 2011-08-23 21:53:19 +02:00
Badlop
24c5063b99 Allow multiple entry with same nick to MUC rooms (thanks to Magnus Henoch)(EJAB-305) 2011-08-23 21:52:20 +02:00
Badlop
83014fb77b Include status 110 in presence to new occupant (EJAB-740) 2011-07-16 19:35:59 +02:00
Badlop
1e88c3f180 Room option to ignore private messages from visitors (thanks to Maxim Ignatenko) 2011-07-11 17:34:07 +02:00
Evgeniy Khramtsov
c98ddeb59f Merge branch '2.1.x' into 2.2.x 
Conflicts:
	src/ejabberd_captcha.erl
	src/expat_erl.c
	src/mod_muc/mod_muc_room.erl
 2011-05-04 00:04:10 +10:00
Evgeniy Khramtsov
4a2f62062e New migration procedure 2011-04-27 15:07:10 +10:00
jabber
897b46c31d Do not decrease MUC admin's role/affiliation 2011-04-18 21:06:05 +10:00
Evgeniy Khramtsov
07cf6f09b8 Implement CAPTCHA limit 2011-04-18 16:06:36 +10:00
Evgeniy Khramtsov
cf6264f507 CAPTCHA whitelist support 2011-04-18 15:47:06 +10:00
Christophe Romain
33d4126290 merge with latest 2.1.x (pre 2.1.7) 2011-04-11 15:47:04 +02:00
Badlop
449e56ed52 Send jid attribute when occupant is banned (EJAB-1432) 2011-04-07 12:54:39 +02:00
Christophe Romain
f39ccd73c5 Merge remote branch 'mainline/2.1.x' into 2.2.x 2011-02-14 13:54:06 +01:00
Christophe Romain
fd52f2cb7d update copyright up to 2011 2011-02-14 13:50:55 +01:00
Badlop
650b2802b5 Remove erroneous comment (EJAB-645) 2011-02-03 17:23:09 +01:00
Evgeniy Khramtsov
02cfb11a6d Merge branch '2.1.x' into mergefix 
Conflicts:
	.gitignore
	src/ejabberd.app
	src/ejabberd_c2s.erl
	src/ejabberd_captcha.erl
	src/ejabberd_node_groups.erl
	src/mod_caps.erl
	src/web/ejabberd_http.erl
	src/web/ejabberd_http_bind.erl
 2010-12-14 23:10:08 +09:00
Badlop
6eeef62ce4 Provide new, not old, affiliation in kick/ban presence with codes 321 and 301 2010-11-16 00:03:09 +01:00
Evgeniy Khramtsov
0ccff15599 Strip status when needed in presence-unavailable as well 2010-11-15 13:47:31 +09:00
Christophe Romain
23b28ec60f Merge remote branch 'mainline/2.1.x' into 2.2.x 2010-08-09 10:04:11 +02:00
Badlop
972440c2ca When user joins non-anonymous room, warn also in presence stanza (EJAB-310) 2010-08-07 20:48:36 +02:00
Christophe Romain
628571f8cf merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +02:00
Evgeniy Khramtsov
715cc5ea3b New configure option: --enable-nif 2010-07-01 20:54:01 +10:00
Evgeniy Khramtsov
21d2f4efab now admins are able to see private rooms in disco (EJAB-1269) 2010-06-23 17:44:35 +10:00
Evgeniy Khramtsov
4646a5dbb8 fixes wrong SQL escaping when --enable-full-xml is set 2010-06-04 13:31:34 +10:00
Badlop
44b282474a Fix indentation (EJAB-1038) 2010-03-29 20:51:24 +02:00
Badlop
70cfcb1008 Fix crash in number of occupants; other minor changes (EJAB-1038) 2010-03-29 20:51:04 +02:00
Badlop
fa28c8baf6 Refactor code to reduce calls to get_affiliation and get_role (thanks to Steam)(EJAB-1038) 2010-03-29 20:49:52 +02:00
Evgeniy Khramtsov
46c667c567 changed Reason to shutdown when stopping destroyed MUC room 
SVN Revision: 2952
 2010-02-02 11:49:49 +00:00
Badlop
db3f8487fc Fix bug handling Reason in gen_fsm:terminate 
SVN Revision: 2950
 2010-02-02 11:14:48 +00:00
Badlop
7b76fdcde7 Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 
SVN Revision: 2891
 2010-01-12 16:11:32 +00:00
Badlop
d9a1eecdca Kick occupants with reason when room is stopped due to MUC shutdown (EJAB-1149) 
SVN Revision: 2848
 2009-12-30 01:25:35 +00:00
Badlop
9bee86178f Write in room log when a room is created, destroyed, started, stopped (EJAB-1144) 
SVN Revision: 2836
 2009-12-29 14:43:24 +00:00
Badlop
575e07a986 Forward IQ vCard queries of room occupants to bare JID, not full (EJAB-1045) 
SVN Revision: 2767
 2009-12-01 20:00:15 +00:00
Badlop
3e45bdcc2d Don't allow room config to enable password protection with empty password (EJAB-1011) 
SVN Revision: 2485
 2009-08-15 20:09:05 +00:00
Badlop
5ddfccd45e If room config violates service policy, return not-acceptable instead of bad-request. 
SVN Revision: 2484
 2009-08-15 20:08:51 +00:00
Badlop
7dfdd5d654 HTML room logs: fix formatting of spaces; log config when disabling logging; display occupants (EJAB-986) 
SVN Revision: 2378
 2009-07-21 18:33:56 +00:00
Badlop
29ea2738cc Include original timestamp on delayed presences (thanks to Mickael Remond)(EJAB-234) 
SVN Revision: 2348
 2009-06-30 17:50:47 +00:00
Badlop
49688feaf2 Add XEP82 Date Time, update XEP202 Entity Time and XEP203 Delayed Delivery (EJAB-234) 
SVN Revision: 2345
 2009-06-30 16:51:25 +00:00
Badlop
29607291ae Added support for captcha feature disability (EJAB-895) 
If the option captcha_cmd is set but captcha can't be created:
* show critical error at server start
* hide captcha option in room configuration form
* don't require occupants to fill captcha

SVN Revision: 2101
 2009-05-26 11:53:58 +00:00
Badlop
5c00365550 Add label in captcha form. Improve translatable strings in captcha and muc room. 
SVN Revision: 2100
 2009-05-26 11:03:45 +00:00
Badlop
9b370787c2 * src/mod_muc/mod_muc_room.erl: Fix badarg return (EJAB-899) 
SVN Revision: 2053
 2009-05-03 11:26:18 +00:00
Badlop
b59ecb83e8 * src/mod_muc/mod_muc.erl: Limit number of characters in Room ID, 
Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 2034
 2009-04-22 12:05:10 +00:00
Badlop
f4c88768da * src/mod_muc/mod_muc.erl: English fixes (thanks to Glenn Sieb) 
* src/mod_muc/mod_muc_log.erl: Likewise
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_register.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 2009
 2009-04-08 19:04:13 +00:00
Evgeniy Khramtsov
7e924341e4 * src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms). 
* src/ejabberd_config.erl: likewise.
* src/ejabberd_sup.erl: likewise.
* src/jlib.hrl: likewise.
* src/web/ejabberd_http.erl: likewise.
* src/mod_muc/mod_muc_room.erl: CAPTCHA support.
* src/mod_muc/mod_muc_room.hrl: likewise.

SVN Revision: 1991
 2009-03-13 16:01:46 +00:00
Badlop
22d87353be * src/mod_muc/mod_muc_room.erl: Owner of a password protected room 
must provide the password, like other participants (EJAB-867)

SVN Revision: 1880
 2009-02-16 15:57:02 +00:00
Badlop
b3328c08a6 * doc/guide.tex: Fix some English strings: JID -> Jabber ID; 
jabberd 1.4 -> jabberd14; commited -> committed
* src/*/*.erl: Likewise
* src/msgs/*.msg: Likewise
* src/msgs/*.po: Likewise

SVN Revision: 1810
 2009-01-12 18:41:46 +00:00
Badlop
f09509502e * doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842) 
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text

SVN Revision: 1804
 2009-01-12 14:44:42 +00:00
Badlop
8e32cc11cb Fix default value of default_room_options (thanks to Aleksey Shchepin) 
SVN Revision: 1702
 2008-12-03 15:06:21 +00:00
Badlop
f124bb3d10 * src/mod_muc/mod_muc_room.erl: Move definitions to header file 
* src/mod_muc/mod_muc_room.hrl: New header file
* src/Makefile.in: Likewise

SVN Revision: 1698
 2008-12-02 19:23:12 +00:00
Badlop
7348f4a553 Remove debug line from SVN r1685 
SVN Revision: 1689
 2008-11-28 19:51:30 +00:00
Alexey Shchepin
964cb84864 * src/mod_muc/mod_muc_room.erl: Clean user activity after timeout 
(EJAB-804)

SVN Revision: 1688
 2008-11-28 16:06:39 +00:00
Badlop
6a785fa536 * src/gen_mod.erl: First store module options in ETS and Mnesia, 
then start the module. In case of failure, remove options from
ETS. Until now the module was started before the options were
stored in database, and some modules started incorrectly because
they couldn't access the options from database; for instance
mod_muc_room required this for reading max_users option.

* src/mod_muc/mod_muc_room.erl: Include the value of max_users
service option and the current max_users room option in the list
of allowed room limit values.

SVN Revision: 1685
 2008-11-26 15:10:38 +00:00
Geoff Cant
35ed848fe8 EJAB-624: fixes mod_muc_room:is_visitor/2 to use get_role not get_affiliation 
SVN Revision: 1534
 2008-08-23 23:17:17 +00:00
Badlop
c3bda4aaee * doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708) 
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise

SVN Revision: 1499
 2008-07-31 11:18:49 +00:00
Badlop
756cd06625 * src/mod_muc/mod_muc_room.erl: Support Reasons for all 
affiliation and role changes (EJAB-306)

SVN Revision: 1498
 2008-07-30 18:24:08 +00:00
Geoff Cant
135da533fd Altering XForms text for allow_visitor_status mod_muc_room option. (EJAB-624) 
SVN Revision: 1480
 2008-07-23 17:45:23 +00:00
Geoff Cant
c7d45af0aa mod_muc_room allow_visitor_presence option rename (now allow_visitor_status). (EJAB-624) 
SVN Revision: 1478
 2008-07-23 16:55:46 +00:00
Geoff Cant
2c3260d07b Renaming allow_visitor_presence to allow_visitor_status (EJAB-624). 
allow_visitor_status when false will strip status message tags from visitor
presence broadcasts in muc rooms.

SVN Revision: 1477
 2008-07-23 16:40:17 +00:00
Geoff Cant
e509da74e8 Implementing muc_room visitor presence restrictions. (EJAB-624) 
SVN Revision: 1475
 2008-07-23 12:31:55 +00:00
Badlop
1b7a36bf64 * src/mod_muc/mod_muc_room.erl: Fix to allow a server admin to add 
himself as owner of a room (EJAB-687)

SVN Revision: 1460
 2008-07-17 17:32:11 +00:00
Badlop
152efbb112 * src/mod_muc/mod_muc_room.erl: Allow to store room 
description (thanks to Christopher Dupont)(EJAB-670)

SVN Revision: 1385
 2008-06-28 17:47:19 +00:00
Badlop
cbf63d06a8 * src/mod_muc/mod_muc_room.erl: Allow admins to send messages to 
rooms even if not joined (EJAB-645)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1356
 2008-06-13 18:55:26 +00:00
Badlop
c892a60da5 * src/mod_muc/mod_muc_room.erl: Allow change_state of a room 
SVN Revision: 1329
 2008-05-16 18:05:03 +00:00
Badlop
da56452fba * src/mod_muc/mod_muc_room.erl: Return Forbidden error message 
when user sends private message in a room that disallows
it (EJAB-595)

SVN Revision: 1323
 2008-05-12 20:35:43 +00:00
Alexey Shchepin
85d3b27d71 * src/mod_muc/mod_muc_room.erl: Fixed room shaper processing 
SVN Revision: 1305
 2008-04-27 19:06:34 +00:00
Badlop
5fd627b85b * doc/api/Makefile: Report the correct ejabberd version. When 
cleaning, remove also erlang.png

* src/mod_muc/mod_muc_room.erl: Update source code to prevent
warning messages from EDoc
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise
* src/mod_pubsub/pubsub.hrl: Likewise

SVN Revision: 1265
 2008-04-01 10:11:39 +00:00
Badlop
22a5bce9de * src/ejabberd_app.erl (prep_stop): Stop modules when stopping 
ejabberd (EJAB-536)
* src/mod_caps.erl (stop): Probably not needed to stop supervisor
child (EJAB-536)
* src/mod_muc/mod_muc.erl (room_destroyed): Catch message
sending (EJAB-536)
* src/mod_muc/mod_muc_room.erl (init): Ensure rooms are called
when the process dies due to a linked die (EJAB-536)

SVN Revision: 1212
 2008-02-28 00:30:23 +00:00
Badlop
def7b0ff90 * src/mod_muc/mod_muc_room.erl: Allow unmoderated rooms (EJAB-437) 
* src/msgs/*: Recover old translations to several languages from
ejabberd 1.1.4

SVN Revision: 1191
 2008-02-14 11:25:39 +00:00
Badlop
8104eac23a * src/mod_muc/mod_muc_room.erl: Bugfix: local message stanza may 
not have an attribute From (EJAB-515)

SVN Revision: 1180
 2008-02-11 12:15:34 +00:00
Badlop
116966ce44 * src/mod_muc/mod_muc_room.erl: Include the error condition in the 
presence status when kicking a participant due to an error
stanza (EJAB-496)

SVN Revision: 1179
 2008-02-09 10:38:47 +00:00
Badlop
0beb1c8116 * src/mod_muc/mod_muc_room.erl: Support for decline of invitation 
to MUC room (EJAB-515)

SVN Revision: 1175
 2008-02-06 20:30:58 +00:00
Alexey Shchepin
24a7d86577 * src/mod_muc/mod_muc_room.erl: Append "(n/a)" to disco room 
descriptions when a number of occupants is not available

SVN Revision: 1171
 2008-02-03 23:17:39 +00:00
Badlop
45b01994e2 * src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a 
private message with type=error (EJAB-496). Updated.

SVN Revision: 1164
 2008-01-29 18:37:45 +00:00
Badlop
cdc1698c8b * src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a 
private message with type=error (EJAB-496)

SVN Revision: 1163
 2008-01-29 14:49:08 +00:00
Badlop
f361633f36 * doc/guide.tex: Updated the names of log files. 
* doc/guide.html: Likewise

* src/mod_muc/mod_muc_room.erl: Added log messages for room
destroy

* src/mod_caps.erl: Small beautify of log error messages

SVN Revision: 1155
 2008-01-16 10:08:17 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Badlop
7672515e76 * src/mod_muc/mod_muc_room.erl: MUC kicks a participant if sends a 
private message with type=error (EJAB-496)

SVN Revision: 1142
 2008-01-09 16:01:16 +00:00
Badlop
c2e12d716b * src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc 
room invitations (EJAB-490)

SVN Revision: 1135
 2008-01-01 17:06:26 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Badlop
afdc9b9527 * src/mod_muc/mod_muc_room.erl: Log room creation and 
destruction. Ensure JID of owners of MUC room are user, not
server (EJAB-435)

SVN Revision: 1104
 2007-12-23 12:28:44 +00:00
Badlop
536a120c9d * src/mod_muc/mod_muc_room.erl: Rephrase the invitation sentence 
to make more natural

SVN Revision: 1025
 2007-12-05 09:09:09 +00:00
Mickaël Rémond
abdbf55c87 * Temporary commit. 
SVN Revision: 1015
 2007-12-03 10:47:42 +00:00
Badlop
4257f0c790 * src/mod_muc/mod_muc_room.erl: Hide the option 'Make room 
moderated' because it isn't implemented, and set the default value
of 'moderated' to true because that is the behaviour
implemented (EJAB-419)

SVN Revision: 999
 2007-11-29 16:16:10 +00:00
Badlop
e7136065fc * src/mod_muc/mod_muc_room.erl: Don't show the room name as the room description (EJAB-382). 
SVN Revision: 989
 2007-11-27 08:09:47 +00:00
Mickaël Rémond
afec054544 * src/ejabberd_c2s.erl: Option to prevent the use of Erlang OTP supervisor for transient processes (EJAB-354). 
* src/ejabberd_s2s_in.erl: Likewise.
* src/ejabberd_s2s_out.erl: Likewise.
* src/mod_muc/mod_muc_room.erl: Likewise.
* src/configure.ac: Likewise.
* src/configure: Likewise.
* src/Makefile.in: Likewise.
* src/mod_muc/Makefile.in: Likewise.

SVN Revision: 931
 2007-09-14 14:16:36 +00:00
Alexey Shchepin
978b7aea12 * src/mod_muc/mod_muc_room.erl: Added logging of MUC admin/owner 
queries

SVN Revision: 907
 2007-09-01 21:15:40 +00:00
Alexey Shchepin
722563ed94 * src/mod_muc/mod_muc_room.erl: Added user_message_shaper and 
room_shaper options
* src/mod_muc/mod_muc.erl: Likewise

SVN Revision: 906
 2007-09-01 21:05:04 +00:00