Guest User

Untitled

a guest
Oct 17th, 2013
157
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.22 KB | None | 0 0
  1. diff --git a/src/main/java/ru/org/linux/auth/IPBlockDao.java b/src/main/java/ru/org/linux/auth/IPBlockDao.java
  2. index 6dd9e6c..ada6687 100644
  3. --- a/src/main/java/ru/org/linux/auth/IPBlockDao.java
  4. +++ b/src/main/java/ru/org/linux/auth/IPBlockDao.java
  5. @@ -73,12 +73,17 @@ public class IPBlockDao {
  6.  
  7.    public static void checkBlockIP(@Nonnull IPBlockInfo block, @Nonnull Errors errors, @Nullable User user)
  8.      throws UnknownHostException, TextParseException {
  9. -    if (getTor(block.getIp())) {
  10. -      errors.reject(null, "Постинг заблокирован: tor.ahbl.org");
  11. -    }
  12. +    boolean isAnonymous = (user == null || user.isAnonymousScore()
  13. +           || !block.isAllowRegistredPosting());
  14. +
  15. +    if (isAnonymous) {
  16. +       if (getTor(block.getIp())) {
  17. +         errors.reject(null, "Постинг заблокирован: tor.ahbl.org");
  18. +       }
  19.  
  20. -    if (block.isBlocked() && (user == null || user.isAnonymousScore() || !block.isAllowRegistredPosting())) {
  21. -      errors.reject(null, "Постинг заблокирован: " + block.getReason());
  22. +       if (block.isBlocked()) {
  23. +         errors.reject(null, "Постинг заблокирован: " + block.getReason());
  24. +       }
  25.      }
  26.    }
Advertisement
Add Comment
Please, Sign In to add comment