ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Banning temporarily/permanently now clears the other flag.

Browse Source
This commit is contained in:
marcins78
2013-06-20 10:42:04 +00:00
parent 577d5db474
commit 25a2808a24
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
View File

@@ -125,14 +125,14 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
}
private String getStatus(Player similarPlayer) {
if (similarPlayer.getType().equals(""))
return "Banned permanently";
if (similarPlayer.getBannedUntil() != null) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
return "Banned until " + format.format(similarPlayer.getBannedUntil());
}
if (similarPlayer.getType().contains("n"))
return "Unbanned";
if (similarPlayer.getType().equals(""))
return "Banned permanently";
return "OK";
}

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbPlayerDAO.java
View File

@@ -88,7 +88,7 @@ public class DbPlayerDAO implements PlayerDAO {
public boolean banPlayerPermanently(String login) throws SQLException {
Connection conn = _dbAccess.getDataSource().getConnection();
try {
PreparedStatement statement = conn.prepareStatement("update player set type='' where name=?");
PreparedStatement statement = conn.prepareStatement("update player set type='', banned_until=null where name=?");
try {
statement.setString(1, login);
return statement.executeUpdate() == 1;
@@ -104,7 +104,7 @@ public class DbPlayerDAO implements PlayerDAO {
public boolean banPlayerTemporarily(String login, long dateTo) throws SQLException {
Connection conn = _dbAccess.getDataSource().getConnection();
try {
PreparedStatement statement = conn.prepareStatement("update player set banned_until=? where name=?");
PreparedStatement statement = conn.prepareStatement("update player set banned_until=?, type='un' where name=?");
try {
statement.setLong(1, dateTo);
statement.setString(2, login);