/[drupal]/contributions/modules/troll/troll.module
ViewVC logotype

Diff of /contributions/modules/troll/troll.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.32.2.10, Sat May 9 05:47:46 2009 UTC revision 1.32.2.11, Sat Jun 13 02:52:20 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: troll.module,v 1.32.2.8 2009/05/04 19:06:09 deekayen Exp $  // $Id: troll.module,v 1.32.2.10 2009/05/09 05:47:46 deekayen Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 457  function troll_is_blacklisted() { Line 457  function troll_is_blacklisted() {
457      return FALSE;      return FALSE;
458    }    }
459    else {    else {
460      $blacklisted = db_result(db_query('SELECT COUNT(b.net) FROM {troll_blacklist} AS b WHERE b.net <= %f AND b.bcast >= %f', $longip, $longip));      $whitelisted = (bool)db_result(db_query_range('SELECT 1 FROM {troll_whitelist} w WHERE w.net <= %f AND w.bcast >= %f', $longip, $longip, 0, 1));
461      $whitelisted = db_result(db_query('SELECT COUNT(w.net) FROM {troll_whitelist} AS w WHERE w.net <= %f AND w.bcast >= %f', $longip, $longip));      if ($whitelisted) {
462      return $whitelisted ? FALSE : $blacklisted;        return FALSE;
463        }
464        return (bool)db_result(db_query_range('SELECT 1 FROM {troll_blacklist} b WHERE b.net <= %f AND b.bcast >= %f', $longip, $longip, 0, 1));
465    }    }
466  }  }
467    
Legend:
Removed from v.1.32.2.10  
changed lines
  Added in v.1.32.2.11
  ViewVC Help
Powered by ViewVC 1.1.2