/[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.38, Sat May 9 03:54:04 2009 UTC revision 1.39, Sat Jun 13 03:12:24 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: troll.module,v 1.36 2009/03/02 02:34:53 deekayen Exp $  // $Id: troll.module,v 1.38 2009/05/09 03:54:04 deekayen Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 466  function troll_is_blacklisted() { Line 466  function troll_is_blacklisted() {
466      return FALSE;      return FALSE;
467    }    }
468    else {    else {
469      $blacklisted = db_query('SELECT COUNT(b.net) FROM {troll_blacklist} AS b WHERE b.net <= :longip AND b.bcast >= :longip', array(':longip' => $longip))->fetchField();      $whitelisted = (bool)db_query_range('SELECT 1 FROM {troll_whitelist} w WHERE w.net <= :longip AND w.bcast >= :longip', array(':longip' => $longip), 0, 1)->fetchField();
470      $whitelisted = db_query('SELECT COUNT(w.net) FROM {troll_whitelist} AS w WHERE w.net <= :longip AND w.bcast >= :longip', array(':longip' => $longip))->fetchField();      if ($whitelisted) {
471      return $whitelisted ? FALSE : $blacklisted;        return FALSE;
472        }
473        return (bool)db_query_range('SELECT 1 FROM {troll_blacklist} b WHERE b.net <= :longip AND b.bcast >= :longip', array(':longip' => $longip), 0, 1)->fetchField();
474    }    }
475  }  }
476    
Legend:
Removed from v.1.38  
changed lines
  Added in v.1.39
  ViewVC Help
Powered by ViewVC 1.1.2