Commit b6b5cb15 authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gato

1) Use system properties to define default room settings. JM-949

2) By default room is non-anonymous. JM-950

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6923 b35dd754-fafc-0310-a699-88a17e54d16e
parent 5a22016c
...@@ -13,10 +13,7 @@ package org.jivesoftware.wildfire.muc.spi; ...@@ -13,10 +13,7 @@ package org.jivesoftware.wildfire.muc.spi;
import org.dom4j.Element; import org.dom4j.Element;
import org.jivesoftware.database.SequenceManager; import org.jivesoftware.database.SequenceManager;
import org.jivesoftware.util.JiveConstants; import org.jivesoftware.util.*;
import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.NotFoundException;
import org.jivesoftware.wildfire.PacketRouter; import org.jivesoftware.wildfire.PacketRouter;
import org.jivesoftware.wildfire.auth.UnauthorizedException; import org.jivesoftware.wildfire.auth.UnauthorizedException;
import org.jivesoftware.wildfire.muc.*; import org.jivesoftware.wildfire.muc.*;
...@@ -141,7 +138,7 @@ public class MUCRoomImpl implements MUCRoom { ...@@ -141,7 +138,7 @@ public class MUCRoomImpl implements MUCRoom {
/** /**
* Indicates if occupants are allowed to change the subject of the room. * Indicates if occupants are allowed to change the subject of the room.
*/ */
private boolean canOccupantsChangeSubject = false; private boolean canOccupantsChangeSubject = JiveGlobals.getBooleanProperty("muc.room.canOccupantsChangeSubject", false);
/** /**
* Maximum number of occupants that could be present in the room. If the limit's been reached * Maximum number of occupants that could be present in the room. If the limit's been reached
...@@ -159,32 +156,32 @@ public class MUCRoomImpl implements MUCRoom { ...@@ -159,32 +156,32 @@ public class MUCRoomImpl implements MUCRoom {
* A public room means that the room is searchable and visible. This means that the room can be * A public room means that the room is searchable and visible. This means that the room can be
* located using disco requests. * located using disco requests.
*/ */
private boolean publicRoom = true; private boolean publicRoom = JiveGlobals.getBooleanProperty("muc.room.publicRoom", true);
/** /**
* Persistent rooms are saved to the database to make sure that rooms configurations can be * Persistent rooms are saved to the database to make sure that rooms configurations can be
* restored in case the server goes down. * restored in case the server goes down.
*/ */
private boolean persistent = false; private boolean persistent = JiveGlobals.getBooleanProperty("muc.room.persistent", false);
/** /**
* Moderated rooms enable only participants to speak. Users that join the room and aren't * Moderated rooms enable only participants to speak. Users that join the room and aren't
* participants can't speak (they are just visitors). * participants can't speak (they are just visitors).
*/ */
private boolean moderated = false; private boolean moderated = JiveGlobals.getBooleanProperty("muc.room.moderated", false);
/** /**
* A room is considered members-only if an invitation is required in order to enter the room. * A room is considered members-only if an invitation is required in order to enter the room.
* Any user that is not a member of the room won't be able to join the room unless the user * Any user that is not a member of the room won't be able to join the room unless the user
* decides to register with the room (thus becoming a member). * decides to register with the room (thus becoming a member).
*/ */
private boolean membersOnly = false; private boolean membersOnly = JiveGlobals.getBooleanProperty("muc.room.membersOnly", false);
/** /**
* Some rooms may restrict the occupants that are able to send invitations. Sending an * Some rooms may restrict the occupants that are able to send invitations. Sending an
* invitation in a members-only room adds the invitee to the members list. * invitation in a members-only room adds the invitee to the members list.
*/ */
private boolean canOccupantsInvite = false; private boolean canOccupantsInvite = JiveGlobals.getBooleanProperty("muc.room.canOccupantsInvite", false);
/** /**
* The password that every occupant should provide in order to enter the room. * The password that every occupant should provide in order to enter the room.
...@@ -195,31 +192,31 @@ public class MUCRoomImpl implements MUCRoom { ...@@ -195,31 +192,31 @@ public class MUCRoomImpl implements MUCRoom {
* Every presence packet can include the JID of every occupant unless the owner deactives this * Every presence packet can include the JID of every occupant unless the owner deactives this
* configuration. * configuration.
*/ */
private boolean canAnyoneDiscoverJID = false; private boolean canAnyoneDiscoverJID = JiveGlobals.getBooleanProperty("muc.room.canAnyoneDiscoverJID", true);
/** /**
* Enables the logging of the conversation. The conversation in the room will be saved to the * Enables the logging of the conversation. The conversation in the room will be saved to the
* database. * database.
*/ */
private boolean logEnabled = false; private boolean logEnabled = JiveGlobals.getBooleanProperty("muc.room.logEnabled", false);
/** /**
* Enables the logging of the conversation. The conversation in the room will be saved to the * Enables the logging of the conversation. The conversation in the room will be saved to the
* database. * database.
*/ */
private boolean loginRestrictedToNickname = false; private boolean loginRestrictedToNickname = JiveGlobals.getBooleanProperty("muc.room.loginRestrictedToNickname", false);
/** /**
* Enables the logging of the conversation. The conversation in the room will be saved to the * Enables the logging of the conversation. The conversation in the room will be saved to the
* database. * database.
*/ */
private boolean canChangeNickname = true; private boolean canChangeNickname = JiveGlobals.getBooleanProperty("muc.room.canChangeNickname", true);
/** /**
* Enables the logging of the conversation. The conversation in the room will be saved to the * Enables the logging of the conversation. The conversation in the room will be saved to the
* database. * database.
*/ */
private boolean registrationEnabled = true; private boolean registrationEnabled = JiveGlobals.getBooleanProperty("muc.room.registrationEnabled", true);
/** /**
* Internal component that handles IQ packets sent by the room owners. * Internal component that handles IQ packets sent by the room owners.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment