mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-10-07 10:57:45 +02:00
parent
bf74c4e7ff
commit
4e61117ef7
@ -1,5 +1,5 @@
|
|||||||
<!-- AUTO-GENERATED FILE! Do not edit this directly -->
|
<!-- AUTO-GENERATED FILE! Do not edit this directly -->
|
||||||
<!-- File auto-generated on Sun May 21 12:23:19 CEST 2017. See docs/config/config.tpl.md -->
|
<!-- File auto-generated on Thu Jul 06 18:45:51 CEST 2017. See docs/config/config.tpl.md -->
|
||||||
|
|
||||||
## AuthMe Configuration
|
## AuthMe Configuration
|
||||||
The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder,
|
The first time you run AuthMe it will create a config.yml file in the plugins/AuthMe folder,
|
||||||
@ -79,6 +79,8 @@ ExternalBoardOptions:
|
|||||||
IPBTablePrefix: 'ipb_'
|
IPBTablePrefix: 'ipb_'
|
||||||
# IP Board default group ID; 3 is the default registered group defined by IP Board
|
# IP Board default group ID; 3 is the default registered group defined by IP Board
|
||||||
IPBActivatedGroupId: 3
|
IPBActivatedGroupId: 3
|
||||||
|
# Xenforo table prefix defined during the Xenforo installation process
|
||||||
|
XFTablePrefix: 'xf_'
|
||||||
# XenForo default group ID; 2 is the default registered group defined by Xenforo
|
# XenForo default group ID; 2 is the default registered group defined by Xenforo
|
||||||
XFActivatedGroupId: 2
|
XFActivatedGroupId: 2
|
||||||
# Wordpress prefix defined during WordPress installation
|
# Wordpress prefix defined during WordPress installation
|
||||||
@ -151,9 +153,11 @@ settings:
|
|||||||
AllowRestrictedUser: false
|
AllowRestrictedUser: false
|
||||||
# The restricted user feature will kick players listed below
|
# The restricted user feature will kick players listed below
|
||||||
# if they don't match the defined IP address. Names are case-insensitive.
|
# if they don't match the defined IP address. Names are case-insensitive.
|
||||||
|
# Ip addresses support regex expressions (regex:127\.0\.0\..*)
|
||||||
# Example:
|
# Example:
|
||||||
# AllowedRestrictedUser:
|
# AllowedRestrictedUser:
|
||||||
# - playername;127.0.0.1
|
# - playername;127.0.0.1
|
||||||
|
# - playername;regex:127\.0\.0\..*
|
||||||
AllowedRestrictedUser: []
|
AllowedRestrictedUser: []
|
||||||
# Ban unknown IPs trying to log in with a restricted username?
|
# Ban unknown IPs trying to log in with a restricted username?
|
||||||
banUnsafedIP: false
|
banUnsafedIP: false
|
||||||
@ -480,7 +484,7 @@ limbo:
|
|||||||
# DEFAULT: always set to default speed;
|
# DEFAULT: always set to default speed;
|
||||||
# MAX_RESTORE: take the maximum of the player's current speed and the previous one
|
# MAX_RESTORE: take the maximum of the player's current speed and the previous one
|
||||||
# RESTORE_NO_ZERO: Like 'restore' but sets speed to default if the player's speed was 0
|
# RESTORE_NO_ZERO: Like 'restore' but sets speed to default if the player's speed was 0
|
||||||
restoreFlySpeed: 'MAX_RESTORE'
|
restoreFlySpeed: 'RESTORE_NO_ZERO'
|
||||||
# Restore walk speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.
|
# Restore walk speed: RESTORE, DEFAULT, MAX_RESTORE, RESTORE_NO_ZERO.
|
||||||
# See above for a description of the values.
|
# See above for a description of the values.
|
||||||
restoreWalkSpeed: 'MAX_RESTORE'
|
restoreWalkSpeed: 'MAX_RESTORE'
|
||||||
@ -524,4 +528,4 @@ To change settings on a running server, save your changes to config.yml and use
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Sun May 21 12:23:19 CEST 2017
|
This page was automatically generated on the [AuthMe/AuthMeReloaded repository](https://github.com/AuthMe/AuthMeReloaded/tree/master/docs/) on Thu Jul 06 18:45:51 CEST 2017
|
||||||
|
@ -15,7 +15,6 @@ import fr.xephi.authme.settings.properties.SecuritySettings;
|
|||||||
import fr.xephi.authme.util.StringUtils;
|
import fr.xephi.authme.util.StringUtils;
|
||||||
import fr.xephi.authme.util.Utils;
|
import fr.xephi.authme.util.Utils;
|
||||||
|
|
||||||
import javax.xml.transform.Result;
|
|
||||||
import java.sql.Blob;
|
import java.sql.Blob;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.DatabaseMetaData;
|
import java.sql.DatabaseMetaData;
|
||||||
@ -49,10 +48,11 @@ public class MySQL implements DataSource {
|
|||||||
|
|
||||||
private String phpBbPrefix;
|
private String phpBbPrefix;
|
||||||
private String ipbPrefix;
|
private String ipbPrefix;
|
||||||
|
private String xfPrefix;
|
||||||
|
private String wordpressPrefix;
|
||||||
private int phpBbGroup;
|
private int phpBbGroup;
|
||||||
private int ipbGroup;
|
private int ipbGroup;
|
||||||
private int xfGroup;
|
private int xfGroup;
|
||||||
private String wordpressPrefix;
|
|
||||||
|
|
||||||
public MySQL(Settings settings) throws ClassNotFoundException, SQLException {
|
public MySQL(Settings settings) throws ClassNotFoundException, SQLException {
|
||||||
setParameters(settings);
|
setParameters(settings);
|
||||||
@ -109,11 +109,12 @@ public class MySQL implements DataSource {
|
|||||||
this.phpBbGroup = settings.getProperty(HooksSettings.PHPBB_ACTIVATED_GROUP_ID);
|
this.phpBbGroup = settings.getProperty(HooksSettings.PHPBB_ACTIVATED_GROUP_ID);
|
||||||
this.ipbPrefix = settings.getProperty(HooksSettings.IPB_TABLE_PREFIX);
|
this.ipbPrefix = settings.getProperty(HooksSettings.IPB_TABLE_PREFIX);
|
||||||
this.ipbGroup = settings.getProperty(HooksSettings.IPB_ACTIVATED_GROUP_ID);
|
this.ipbGroup = settings.getProperty(HooksSettings.IPB_ACTIVATED_GROUP_ID);
|
||||||
|
this.xfPrefix = settings.getProperty(HooksSettings.XF_TABLE_PREFIX);
|
||||||
this.xfGroup = settings.getProperty(HooksSettings.XF_ACTIVATED_GROUP_ID);
|
this.xfGroup = settings.getProperty(HooksSettings.XF_ACTIVATED_GROUP_ID);
|
||||||
this.wordpressPrefix = settings.getProperty(HooksSettings.WORDPRESS_TABLE_PREFIX);
|
this.wordpressPrefix = settings.getProperty(HooksSettings.WORDPRESS_TABLE_PREFIX);
|
||||||
this.poolSize = settings.getProperty(DatabaseSettings.MYSQL_POOL_SIZE);
|
this.poolSize = settings.getProperty(DatabaseSettings.MYSQL_POOL_SIZE);
|
||||||
if (poolSize == -1) {
|
if (poolSize == -1) {
|
||||||
poolSize = Utils.getCoreCount()*3;
|
poolSize = Utils.getCoreCount() * 3;
|
||||||
}
|
}
|
||||||
this.useSsl = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
|
this.useSsl = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
|
||||||
}
|
}
|
||||||
@ -140,7 +141,7 @@ public class MySQL implements DataSource {
|
|||||||
|
|
||||||
// Encoding
|
// Encoding
|
||||||
ds.addDataSourceProperty("characterEncoding", "utf8");
|
ds.addDataSourceProperty("characterEncoding", "utf8");
|
||||||
ds.addDataSourceProperty("encoding","UTF-8");
|
ds.addDataSourceProperty("encoding", "UTF-8");
|
||||||
ds.addDataSourceProperty("useUnicode", "true");
|
ds.addDataSourceProperty("useUnicode", "true");
|
||||||
|
|
||||||
// Random stuff
|
// Random stuff
|
||||||
@ -308,7 +309,7 @@ public class MySQL implements DataSource {
|
|||||||
}
|
}
|
||||||
if (hashAlgorithm == HashAlgorithm.XFBCRYPT) {
|
if (hashAlgorithm == HashAlgorithm.XFBCRYPT) {
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(
|
try (PreparedStatement pst2 = con.prepareStatement(
|
||||||
"SELECT data FROM xf_user_authenticate WHERE " + col.ID + "=?;")) {
|
"SELECT data FROM " + xfPrefix + "user_authenticate WHERE " + col.ID + "=?;")) {
|
||||||
pst2.setInt(1, id);
|
pst2.setInt(1, id);
|
||||||
try (ResultSet rs = pst2.executeQuery()) {
|
try (ResultSet rs = pst2.executeQuery()) {
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
@ -337,7 +338,7 @@ public class MySQL implements DataSource {
|
|||||||
+ col.LAST_LOGIN + "," + col.REAL_NAME + "," + col.EMAIL
|
+ col.LAST_LOGIN + "," + col.REAL_NAME + "," + col.EMAIL
|
||||||
+ (useSalt ? "," + col.SALT : "")
|
+ (useSalt ? "," + col.SALT : "")
|
||||||
+ ") VALUES (?,?,?,?,?,?" + (useSalt ? ",?" : "") + ");";
|
+ ") VALUES (?,?,?,?,?,?" + (useSalt ? ",?" : "") + ");";
|
||||||
try ( PreparedStatement pst = con.prepareStatement(sql)) {
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
pst.setString(1, auth.getNickname());
|
pst.setString(1, auth.getNickname());
|
||||||
pst.setString(2, auth.getPassword().getHash());
|
pst.setString(2, auth.getPassword().getHash());
|
||||||
pst.setString(3, auth.getIp());
|
pst.setString(3, auth.getIp());
|
||||||
@ -359,16 +360,15 @@ public class MySQL implements DataSource {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (hashAlgorithm == HashAlgorithm.IPB4){
|
if (hashAlgorithm == HashAlgorithm.IPB4) {
|
||||||
sql = "SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
sql = "SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
pst.setString(1, auth.getNickname());
|
pst.setString(1, auth.getNickname());
|
||||||
try (ResultSet rs = pst.executeQuery()) {
|
try (ResultSet rs = pst.executeQuery()) {
|
||||||
if (rs.next()){
|
if (rs.next()) {
|
||||||
// Update player group in core_members
|
// Update player group in core_members
|
||||||
sql = "UPDATE " + ipbPrefix + tableName + " SET "+ tableName + ".member_group_id=? WHERE " + col.NAME + "=?;";
|
sql = "UPDATE " + ipbPrefix + tableName + " SET " + tableName + ".member_group_id=? WHERE " + col.NAME + "=?;";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql))
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
{
|
|
||||||
pst2.setInt(1, ipbGroup);
|
pst2.setInt(1, ipbGroup);
|
||||||
pst2.setString(2, auth.getNickname());
|
pst2.setString(2, auth.getNickname());
|
||||||
pst2.executeUpdate();
|
pst2.executeUpdate();
|
||||||
@ -376,7 +376,7 @@ public class MySQL implements DataSource {
|
|||||||
// Get current time without ms
|
// Get current time without ms
|
||||||
long time = System.currentTimeMillis() / 1000;
|
long time = System.currentTimeMillis() / 1000;
|
||||||
// update joined date
|
// update joined date
|
||||||
sql = "UPDATE " + ipbPrefix + tableName + " SET "+ tableName + ".joined=? WHERE " + col.NAME + "=?;";
|
sql = "UPDATE " + ipbPrefix + tableName + " SET " + tableName + ".joined=? WHERE " + col.NAME + "=?;";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
pst2.setLong(1, time);
|
pst2.setLong(1, time);
|
||||||
pst2.setString(2, auth.getNickname());
|
pst2.setString(2, auth.getNickname());
|
||||||
@ -392,7 +392,7 @@ public class MySQL implements DataSource {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (hashAlgorithm == HashAlgorithm.PHPBB) {
|
} else if (hashAlgorithm == HashAlgorithm.PHPBB) {
|
||||||
sql = "SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
sql = "SELECT " + col.ID + " FROM " + tableName + " WHERE " + col.NAME + "=?;";
|
||||||
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
try (PreparedStatement pst = con.prepareStatement(sql)) {
|
||||||
pst.setString(1, auth.getNickname());
|
pst.setString(1, auth.getNickname());
|
||||||
@ -537,7 +537,7 @@ public class MySQL implements DataSource {
|
|||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
int id = rs.getInt(col.ID);
|
int id = rs.getInt(col.ID);
|
||||||
// Insert player password, salt in xf_user_authenticate
|
// Insert player password, salt in xf_user_authenticate
|
||||||
sql = "INSERT INTO xf_user_authenticate (user_id, scheme_class, data) VALUES (?,?,?)";
|
sql = "INSERT INTO " + xfPrefix + "user_authenticate (user_id, scheme_class, data) VALUES (?,?,?)";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
pst2.setInt(1, id);
|
pst2.setInt(1, id);
|
||||||
pst2.setString(2, XfBCrypt.SCHEME_CLASS);
|
pst2.setString(2, XfBCrypt.SCHEME_CLASS);
|
||||||
@ -549,21 +549,21 @@ public class MySQL implements DataSource {
|
|||||||
pst2.executeUpdate();
|
pst2.executeUpdate();
|
||||||
}
|
}
|
||||||
// Update player group in xf_users
|
// Update player group in xf_users
|
||||||
sql = "UPDATE " + tableName + " SET "+ tableName + ".user_group_id=? WHERE " + col.NAME + "=?;";
|
sql = "UPDATE " + tableName + " SET " + tableName + ".user_group_id=? WHERE " + col.NAME + "=?;";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
pst2.setInt(1, xfGroup);
|
pst2.setInt(1, xfGroup);
|
||||||
pst2.setString(2, auth.getNickname());
|
pst2.setString(2, auth.getNickname());
|
||||||
pst2.executeUpdate();
|
pst2.executeUpdate();
|
||||||
}
|
}
|
||||||
// Update player permission combination in xf_users
|
// Update player permission combination in xf_users
|
||||||
sql = "UPDATE " + tableName + " SET "+ tableName + ".permission_combination_id=? WHERE " + col.NAME + "=?;";
|
sql = "UPDATE " + tableName + " SET " + tableName + ".permission_combination_id=? WHERE " + col.NAME + "=?;";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
pst2.setInt(1, xfGroup);
|
pst2.setInt(1, xfGroup);
|
||||||
pst2.setString(2, auth.getNickname());
|
pst2.setString(2, auth.getNickname());
|
||||||
pst2.executeUpdate();
|
pst2.executeUpdate();
|
||||||
}
|
}
|
||||||
// Insert player privacy combination in xf_user_privacy
|
// Insert player privacy combination in xf_user_privacy
|
||||||
sql = "INSERT INTO xf_user_privacy (user_id, allow_view_profile, allow_post_profile, allow_send_personal_conversation, allow_view_identities, allow_receive_news_feed) VALUES (?,?,?,?,?,?)";
|
sql = "INSERT INTO " + xfPrefix + "user_privacy (user_id, allow_view_profile, allow_post_profile, allow_send_personal_conversation, allow_view_identities, allow_receive_news_feed) VALUES (?,?,?,?,?,?)";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
pst2.setInt(1, id);
|
pst2.setInt(1, id);
|
||||||
pst2.setString(2, "everyone");
|
pst2.setString(2, "everyone");
|
||||||
@ -574,7 +574,7 @@ public class MySQL implements DataSource {
|
|||||||
pst2.executeUpdate();
|
pst2.executeUpdate();
|
||||||
}
|
}
|
||||||
// Insert player group relation in xf_user_group_relation
|
// Insert player group relation in xf_user_group_relation
|
||||||
sql = "INSERT INTO xf_user_group_relation (user_id, user_group_id, is_primary) VALUES (?,?,?)";
|
sql = "INSERT INTO " + xfPrefix + "user_group_relation (user_id, user_group_id, is_primary) VALUES (?,?,?)";
|
||||||
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
try (PreparedStatement pst2 = con.prepareStatement(sql)) {
|
||||||
pst2.setInt(1, id);
|
pst2.setInt(1, id);
|
||||||
pst2.setInt(2, xfGroup);
|
pst2.setInt(2, xfGroup);
|
||||||
@ -628,7 +628,7 @@ public class MySQL implements DataSource {
|
|||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
int id = rs.getInt(col.ID);
|
int id = rs.getInt(col.ID);
|
||||||
// Insert password in the correct table
|
// Insert password in the correct table
|
||||||
sql = "UPDATE xf_user_authenticate SET data=? WHERE " + col.ID + "=?;";
|
sql = "UPDATE " + xfPrefix + "user_authenticate SET data=? WHERE " + col.ID + "=?;";
|
||||||
PreparedStatement pst2 = con.prepareStatement(sql);
|
PreparedStatement pst2 = con.prepareStatement(sql);
|
||||||
String serializedHash = XfBCrypt.serializeHash(password.getHash());
|
String serializedHash = XfBCrypt.serializeHash(password.getHash());
|
||||||
byte[] bytes = serializedHash.getBytes();
|
byte[] bytes = serializedHash.getBytes();
|
||||||
@ -639,7 +639,7 @@ public class MySQL implements DataSource {
|
|||||||
pst2.executeUpdate();
|
pst2.executeUpdate();
|
||||||
pst2.close();
|
pst2.close();
|
||||||
// ...
|
// ...
|
||||||
sql = "UPDATE xf_user_authenticate SET scheme_class=? WHERE " + col.ID + "=?;";
|
sql = "UPDATE " + xfPrefix + "user_authenticate SET scheme_class=? WHERE " + col.ID + "=?;";
|
||||||
pst2 = con.prepareStatement(sql);
|
pst2 = con.prepareStatement(sql);
|
||||||
pst2.setString(1, XfBCrypt.SCHEME_CLASS);
|
pst2.setString(1, XfBCrypt.SCHEME_CLASS);
|
||||||
pst2.setInt(2, id);
|
pst2.setInt(2, id);
|
||||||
@ -707,7 +707,7 @@ public class MySQL implements DataSource {
|
|||||||
try (ResultSet rs = xfSelect.executeQuery()) {
|
try (ResultSet rs = xfSelect.executeQuery()) {
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
int id = rs.getInt(col.ID);
|
int id = rs.getInt(col.ID);
|
||||||
sql = "DELETE FROM xf_user_authenticate WHERE " + col.ID + "=?;";
|
sql = "DELETE FROM " + xfPrefix + "user_authenticate WHERE " + col.ID + "=?;";
|
||||||
try (PreparedStatement xfDelete = con.prepareStatement(sql)) {
|
try (PreparedStatement xfDelete = con.prepareStatement(sql)) {
|
||||||
xfDelete.setInt(1, id);
|
xfDelete.setInt(1, id);
|
||||||
xfDelete.executeUpdate();
|
xfDelete.executeUpdate();
|
||||||
@ -924,7 +924,7 @@ public class MySQL implements DataSource {
|
|||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
PlayerAuth pAuth = buildAuthFromResultSet(rs);
|
PlayerAuth pAuth = buildAuthFromResultSet(rs);
|
||||||
if (hashAlgorithm == HashAlgorithm.XFBCRYPT) {
|
if (hashAlgorithm == HashAlgorithm.XFBCRYPT) {
|
||||||
try (PreparedStatement pst = con.prepareStatement("SELECT data FROM xf_user_authenticate WHERE " + col.ID + "=?;")) {
|
try (PreparedStatement pst = con.prepareStatement("SELECT data FROM " + xfPrefix + "user_authenticate WHERE " + col.ID + "=?;")) {
|
||||||
int id = rs.getInt(col.ID);
|
int id = rs.getInt(col.ID);
|
||||||
pst.setInt(1, id);
|
pst.setInt(1, id);
|
||||||
ResultSet rs2 = pst.executeQuery();
|
ResultSet rs2 = pst.executeQuery();
|
||||||
@ -1016,8 +1016,9 @@ public class MySQL implements DataSource {
|
|||||||
/**
|
/**
|
||||||
* Checks if the last login column has a type that needs to be migrated.
|
* Checks if the last login column has a type that needs to be migrated.
|
||||||
*
|
*
|
||||||
* @param con connection to the database
|
* @param con connection to the database
|
||||||
* @param metaData lastlogin column meta data
|
* @param metaData lastlogin column meta data
|
||||||
|
*
|
||||||
* @throws SQLException .
|
* @throws SQLException .
|
||||||
*/
|
*/
|
||||||
private void migrateLastLoginColumn(Connection con, DatabaseMetaData metaData) throws SQLException {
|
private void migrateLastLoginColumn(Connection con, DatabaseMetaData metaData) throws SQLException {
|
||||||
|
@ -57,11 +57,15 @@ public final class HooksSettings implements SettingsHolder {
|
|||||||
@Comment("IP Board table prefix defined during the IP Board installation process")
|
@Comment("IP Board table prefix defined during the IP Board installation process")
|
||||||
public static final Property<String> IPB_TABLE_PREFIX =
|
public static final Property<String> IPB_TABLE_PREFIX =
|
||||||
newProperty("ExternalBoardOptions.IPBTablePrefix", "ipb_");
|
newProperty("ExternalBoardOptions.IPBTablePrefix", "ipb_");
|
||||||
|
|
||||||
@Comment("IP Board default group ID; 3 is the default registered group defined by IP Board")
|
@Comment("IP Board default group ID; 3 is the default registered group defined by IP Board")
|
||||||
public static final Property<Integer> IPB_ACTIVATED_GROUP_ID =
|
public static final Property<Integer> IPB_ACTIVATED_GROUP_ID =
|
||||||
newProperty("ExternalBoardOptions.IPBActivatedGroupId", 3);
|
newProperty("ExternalBoardOptions.IPBActivatedGroupId", 3);
|
||||||
|
|
||||||
|
@Comment("Xenforo table prefix defined during the Xenforo installation process")
|
||||||
|
public static final Property<String> XF_TABLE_PREFIX =
|
||||||
|
newProperty("ExternalBoardOptions.XFTablePrefix", "xf_");
|
||||||
|
|
||||||
@Comment("XenForo default group ID; 2 is the default registered group defined by Xenforo")
|
@Comment("XenForo default group ID; 2 is the default registered group defined by Xenforo")
|
||||||
public static final Property<Integer> XF_ACTIVATED_GROUP_ID =
|
public static final Property<Integer> XF_ACTIVATED_GROUP_ID =
|
||||||
newProperty("ExternalBoardOptions.XFActivatedGroupId", 2);
|
newProperty("ExternalBoardOptions.XFActivatedGroupId", 2);
|
||||||
|
@ -22,7 +22,7 @@ public class AuthMeSettingsRetrieverTest {
|
|||||||
// an error margin of 10: this prevents us from having to adjust the test every time the config is changed.
|
// an error margin of 10: this prevents us from having to adjust the test every time the config is changed.
|
||||||
// If this test fails, replace the first argument in closeTo() with the new number of properties
|
// If this test fails, replace the first argument in closeTo() with the new number of properties
|
||||||
assertThat((double) configurationData.getProperties().size(),
|
assertThat((double) configurationData.getProperties().size(),
|
||||||
closeTo(160, 10));
|
closeTo(171, 10));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user