diff --git a/troll.admin.inc b/troll.admin.inc
index 3da866b..e7d8863 100644
--- a/troll.admin.inc
+++ b/troll.admin.inc
@@ -106,7 +106,7 @@ function troll_ip_ban_submit($form, &$form_state) {
  * @return string
  */
 function troll_blacklist_summary() {
-  $count = db_result(db_query('SELECT COUNT(net) FROM {troll_blacklist}'));
+  $count = db_query('SELECT COUNT(net) FROM {troll_blacklist}');
   return t('%d address blocks filtered.', array('%d' => $count));
 }
 
@@ -402,28 +402,27 @@ function troll_blacklist_search($ip_address) {
   );
 
   if ($ip_address == '') {
-    $result = pager_query('SELECT net, bcast FROM {troll_blacklist}', 25, 0, 'SELECT COUNT(*) FROM {troll_blacklist}');
+    $query = db_select('troll_blacklist', 't')->extend('PagerDefault');
+    $result = $query->fields('t', array('net', 'bcast'))->limit(25)->execute();
   }
   else {
-    $sql = "SELECT net, bcast FROM {troll_blacklist} WHERE net <= %f AND bcast >= %f";
-    $count_sql = 'SELECT COUNT(*) FROM {troll_blacklist} WHERE net <= %f AND bcast >= %f';
     $longip = _troll_longip($ip_address);
-    $sql .= tablesort_sql($headers);
-    $result = pager_query($sql, 25, 0, $count_sql, $longip, $longip);
+    $query = db_select('troll_blacklist', 't')->extend('PagerDefault')->extend('TableSort');
+    $result = $query->condition('net', $longip, '<=')->condition('bcast', $longip, '>=')->limit(25)->orderByHeader($headers)->execute();
   }
 
-  while ($row = db_fetch_object($result)) {
+  foreach ($result as $row) {
     $printnet = long2ip($row->net);
     $printbcast = long2ip($row->bcast);
     $action = l(t('remove'), "admin/user/troll/ip_blacklist/deleteblack/{$row->net}/{$row->bcast}");
     $rows[] = array($printnet, $printbcast, $action);
   }
   if (!empty($rows)) {
-    $pager = theme('pager', NULL, 25, 0);
+    $pager = theme(array('tags' => 'pager', 'element' => NULL, 'parameters' => NULL, 'quantity' => 25));
     if (!empty($pager)) {
       $rows[] = array(array('data' => $pager, 'colspan' => 3));
     }
-    return theme('table', $headers, $rows);
+    return theme(array('tags' => 'table', 'parameters' => $headers, 'quantity' => 25));
   }
   else {
     drupal_set_message(t('No matches found.'));
@@ -449,21 +448,21 @@ function troll_whitelist($net = NULL, $bcast = NULL) {
     array('data' => t('Actions'), 'field' => 'delete')
   );
 
-  $sql .= tablesort_sql($headers);
-  $result = pager_query($sql, 25, 0, $count_sql);
-  while ($row = db_fetch_object($result)) {
+  $query = db_select('troll_whitelist', 't')->extend('PagerDefault')->extend('TableSort');
+  $result = $query->fields('t', array('net', 'bcast'))->limit(25)->orderByHeader($headers)->execute();
+  foreach ($result as $row) {
     $printnet = long2ip($row->net);
     $printbcast = long2ip($row->bcast);
     $action = l(t('remove'), "admin/user/troll/ip_blacklist/deletewhite/{$row->net}/{$row->bcast}");
     $rows[] = array($printnet, $printbcast, $action);
   }
 
-  $pager = theme('pager', NULL, 25, 0);
+  $pager = theme(array('tags' => 'pager', 'element' => NULL, 'parameters' => NULL, 'quantity' => 25));
   if (!empty($pager)) {
     $rows[] = array(array('data' => $pager, 'colspan' => 3));
   }
 
-  return theme('table', $headers, $rows);
+  return theme(array('tags' => 'table', 'parameters' => $headers, 'quantity' => 25));
 }
 
 /**
@@ -533,7 +532,7 @@ function troll_whitelist_form_submit($form, &$form_state) {
  * @param $uid
  */
 function troll_confirm_block_user_form($form_state, $uid) {
-  $account = user_load(array('uid' => $uid));
+  $account = user_load($uid);
   if (!$account) {
     drupal_goto('admin/user/troll');
   }
@@ -562,7 +561,7 @@ function troll_ip_ban_form($form_state, $iid = NULL) {
     '#weight' => 1,
   );
 
-  $ip = db_fetch_object(db_query('SELECT * FROM {troll_ip_ban} WHERE iid = %d', $iid));
+  $ip = db_query('SELECT * FROM {troll_ip_ban} WHERE iid = :iid', array(':iid' => $iid));
   $form['iid'] = array(
     '#type' => 'value',
     '#value' => !empty($ip->iid) ? $ip->iid : '',
@@ -611,9 +610,9 @@ function troll_ip_ban_form_submit($form, &$form_state) {
  * Helper function to return the expire form elements.
  */
 function troll_ip_ban_expire_form(&$form, $ip) {
-  $timestamp = isset($ip->expires) ? $ip->expires : time();
+  $timestamp = isset($ip->expires) ? $ip->expires : REQUEST_TIME;
 
-  $date = getdate(gmmktime());
+  $date = getdate(REQUEST_TIME);
   $curyear = $date['year'];
   $i = 0;
   while ($i < 10) {
@@ -669,9 +668,11 @@ function troll_display_ip() {
     array('data' => t('Actions'), 'field' => 'delete')
   );
 
-  $sql .= tablesort_sql($headers);
-  $result = pager_query($sql, 25, 0, $count_sql);
-  while ($row = db_fetch_object($result)) {
+  $query = db_select('troll_ip_ban')->extend('TableSort');
+  $query->fields('troll_ip_ban', array('iid', 'ip_address', 'domain_name', 'expires', 'uid'));
+  $query->orderByHeader($headers);
+  $result = $query->execute();
+  foreach ($result as $row) {
     $thisip = l($row->ip_address, 'admin/user/troll/ip_ban/edit/'. $row->iid);
     $thisdom = l(($row->domain_name ? $row->domain_name : gethostbyname($row->ip_address)), 'admin/user/troll/ip_ban/edit/'. $row->iid);
     $expires = ($row->expires ? date('M d, Y', $row->expires) : t('never'));
@@ -679,12 +680,12 @@ function troll_display_ip() {
     $rows[] = array($thisip, $thisdom, $expires, $action);
   }
 
-  $pager = theme('pager', NULL, 25, 0);
+  $pager = theme(array('tags' => 'pager', 'element' => null, 'parameteres' => null, 'quantity' => 25));
   if (!empty($pager)) {
     $rows[] = array(array('data' => $pager, 'colspan' => 5));
   }
 
-  return theme('table', $headers, $rows);
+  return theme(array('tags' => 'table', 'parameters' => $headers, 'quantity' => 1));
 }
 
 /**
@@ -904,10 +905,6 @@ function troll_list_users($edit) {
     $args[] = strtotime($edit['date_created']);
   }
 
-  $sql = "SELECT u.uid, u.name, u.mail, u.status, t.ip_address, MAX(t.accessed) AS recorded, u.created FROM {users} u LEFT JOIN {troll_ip_track} t ON u.uid = t.uid";
-
-  $sql .= ' WHERE '. implode(' AND ', $where);
-
   $headers = array(
     array('data' => t('Username'), 'field' => 'u.name'),
     array('data' => t('Email'), 'field' => 'u.mail'),
@@ -918,18 +915,22 @@ function troll_list_users($edit) {
     array('data' => t('Actions'), 'field' => 'actions')
   );
 
-  $sql .= ' GROUP BY u.uid, u.name, u.mail, u.status, t.ip_address, u.created';
-  $sql .= tablesort_sql($headers);
-
-  $count_sql = 'SELECT COUNT(*) FROM {users} u LEFT JOIN {troll_ip_track} t ON u.uid = t.uid WHERE '. implode(' AND ', $where) .' AND u.uid <> 0';
-  $result = pager_query($sql, 25, 0, $count_sql, $args);
+  $query = db_select('users', 'u')/*->extend('PagerDefault')*/->extend('TableSort');
+    $query->leftJoin('troll_ip_track', 't', 'u.uid = t.uid');
+    $query->groupBy('u.uid')->groupBy('u.name')->groupBy('u.mail')->groupBy('u.status')->groupBy('t.ip_address')->groupBy('u.created');
+    $query->fields('u', array('uid', 'name', 'mail', 'status', 'created'))->fields('t', array('ip_address', 'accessed'))
+      //->extend("PagerDefault")
+      ->range(0, 25)
+      //->limit(10)
+      ->orderByHeader($headers);
+    $result = $query->execute();
 
-  while ($user = db_fetch_object($result)) {
+  foreach ($result as $user) {
     $name = l($user->name, 'admin/user/troll/search/view/'. $user->uid, array('title' => t('View detailed user information')));
     $email = $user->mail;
     $status = ($user->status ? t('Active') : t('Blocked'));
     $ip = ($user->ip_address ? l($user->ip_address, 'admin/user/troll/search/view/'. $user->uid, array('title' => t('View detailed user information'))) : t('none'));
-    $recorded = ($user->recorded ? date('M d, Y', $user->recorded) : t('none recorded'));
+    $recorded = ($user->accessed ? date('M d, Y', $user->accessed) : t('none recorded'));
     $created = date('M d, Y', $user->created);
     $actions = array();
 
@@ -945,17 +946,17 @@ function troll_list_users($edit) {
     if ($user->ip_address) {
       $actions[] = array('title' => t('Ban IP'), 'href' => 'admin/user/troll/ip_ban/user/'. $user->uid);
     }
-    $action = theme('links', $actions);
+    $action = theme(array('tags' => 'links', 'parameters' => $actions));
     $rows[] = array($name, $email, $status, $ip, $recorded, $created, $action);
   }
 
-  $pager = theme('pager', NULL, 25);
+  $pager = theme(array('tags' => 'pager', 'element' => null, 'parameters' => null, 'quantity' => 25));
 
   if (!empty($pager)) {
     $rows[] = array(array('data' => $pager, 'colspan' => 7));
   }
 
-  return theme('table', $headers, $rows);
+  return theme(array('tags' => 'table', 'parameters' => $headers, 'quantity' => 25));
 }
 
 /**
@@ -967,7 +968,7 @@ function troll_list_users($edit) {
  * @return string
  */
 function troll_search_user_detail($uid) {
-  $u = user_load(array('uid' => $uid));
+  $u = user_load($uid);
   $u->ip = db_fetch_object(db_query('SELECT t.ip_address FROM {troll_ip_track} t WHERE t.uid = %d GROUP BY t.uid, t.ip_address', $uid));
 
   $form['details'] = array(
@@ -1032,7 +1033,7 @@ function troll_search_user_detail($uid) {
   while ($ip = db_fetch_object($results)) {
     $banned = db_fetch_object(db_query('SELECT * FROM {troll_ip_ban} WHERE ip_address = \'%s\'', $ip->ip_address));
     if (!empty($banned->ip_address)) {
-      if ($banned->expires && $banned->expires < time()) {
+      if ($banned->expires && $banned->expires < REQUEST_TIME) {
         $status = l(t('expired'), 'admin/user/troll/ip_ban/edit/'. $banned->iid, array('title' => t('Edit IP ban information')));
       }
       else {
@@ -1052,7 +1053,7 @@ function troll_search_user_detail($uid) {
   $content .= theme('box', t('IP History'), ($posts ? $posts : t('No ip history')));
 
   // Get recent posts.
-  $rdat = db_query_range("SELECT * FROM {node} WHERE uid = %d ORDER BY created DESC", $uid, 0, 5);
+  $rdat = db_query_range("SELECT * FROM {node} n WHERE n.uid = :uid ORDER BY n.created DESC", 0, 5, array(':uid' => $uid));
   $posts = NULL;
   $rows = array();
   while ($node = db_fetch_object($rdat)) {
diff --git a/troll.info b/troll.info
index c716a62..90959f6 100644
--- a/troll.info
+++ b/troll.info
@@ -1,5 +1,8 @@
-; $Id $
 name = Troll
 description = Provides tools for community sites including users by IP address, banning IP addresses, advanced user searching, and blocking user by role.
-core = 6.x
-php = 5.2
+core = 7.x
+files[] = troll.module
+files[] = troll.install
+files[] = troll.admin.inc
+files[] = troll.test
+php = 5.3.5
diff --git a/troll.module b/troll.module
index bf631d8..f3b628f 100644
--- a/troll.module
+++ b/troll.module
@@ -29,7 +29,7 @@ function troll_boot() {
           drupal_set_header('HTTP/1.0 404 Not Found');
           drupal_set_title(t('Page not found'));
           watchdog('troll', 'Alternate 404 page displayed to @ip', array('@ip' => $ip), WATCHDOG_INFO);
-          print theme('page', '');
+          //print theme('page', '');
           exit;
           break;
         case 'redirect':
@@ -64,19 +64,19 @@ function troll_boot() {
   global $user;
 
   if ($user->uid) {
-    $track = db_result(db_query("SELECT COUNT(ip_address) FROM {troll_ip_track} WHERE uid = %d AND ip_address = '%s'", $user->uid, $ip));
+    $track = db_query("SELECT COUNT(ip_address) FROM {troll_ip_track} WHERE uid = :id AND ip_address = :ip", array(':id' => $user->uid, ':ip' => $ip))->fetchField();
     if (!empty($track)) {
       // A record for this IP exists. Update accessed timestamp.
-      db_query("UPDATE {troll_ip_track} SET accessed = %d WHERE uid = %d AND ip_address = '%s'", time(), $user->uid, $ip);
+      db_query("UPDATE {troll_ip_track} SET accessed = :time WHERE uid = :uid AND ip_address = :ip", array(':time' => REQUEST_TIME, ':uid' => $user->uid, ':ip' => $ip));
     }
     else {
       // Insert new IP record for user.
-      db_query("INSERT INTO {troll_ip_track} (uid, ip_address, created, accessed) VALUES (%d, '%s', %d, %d)", $user->uid, $ip, time(), time());
+      db_query("INSERT INTO {troll_ip_track} (uid, ip_address, created, accessed) VALUES (:uid, :ip, :t1, :t2)", array(':uid' => $user->uid, ':ip' => $ip, ':t1' => REQUEST_TIME, ':t2' => REQUEST_TIME));
     }
   }
 
   if (variable_get('troll_enable_ip_ban', 1)) {
-    $domain = db_result(db_query_range("SELECT domain_name FROM {troll_ip_ban} WHERE (expires > %d OR expires = 0) AND ip_address = '%s'", time(), $ip, 0, 1));
+    $domain = db_query_range("SELECT domain_name FROM {troll_ip_ban} WHERE (expires > :exp OR expires = 0) AND ip_address = :ip", 0, 1, array(':exp' => REQUEST_TIME, ':ip' => $ip))->fetchField();
     if ($domain !== FALSE) {
       global $base_url;
       watchdog('troll', 'IP Ban: @addr Domain: @domain', array('@addr' => $ip, '@domain' => $domain), WATCHDOG_INFO);
@@ -142,10 +142,14 @@ function troll_help($path, $arg) {
 }
 
 /**
- * Implementation of hook_perm().
+ * Implementation of hook_permission().
  */
-function troll_perm() {
-  return array('administer troll');
+function troll_permission() {
+  return array(
+    'administer troll' => array(
+      'title' => t('Administer Troll'),
+    ),
+  );
 }
 
 /**
@@ -154,7 +158,7 @@ function troll_perm() {
  * @return array
  */
 function troll_menu() {
-  $items['admin/user/troll'] = array(
+  $items['admin/config/people/troll'] = array(
     'title' => 'Troll',
     'description' => 'Manage visitor IP banning.',
     'page callback' => 'drupal_get_form',
@@ -163,7 +167,7 @@ function troll_menu() {
     'weight' => 0,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/search'] = array(
+  $items['admin/config/people/troll/search'] = array(
     'title' => 'Search Users',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_search_form'),
@@ -172,14 +176,14 @@ function troll_menu() {
     'weight' => 0,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/search/view'] = array(
+  $items['admin/config/people/troll/search/view'] = array(
     'title' => 'Search Users',
     'page callback' => 'troll_search_user_detail',
     'access arguments' => array('administer troll'),
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/search/block'] = array(
+  $items['admin/config/people/troll/search/block'] = array(
     'title' => 'Block User',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_confirm_block_user_form'),
@@ -187,7 +191,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_ban'] = array(
+  $items['admin/config/people/troll/ip_ban'] = array(
     'title' => 'IP Banning',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_ip_ban'),
@@ -196,7 +200,7 @@ function troll_menu() {
     'weight' => 1,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_ban/edit'] = array(
+  $items['admin/config/people/troll/ip_ban/edit'] = array(
     'title' => 'IP Ban Form',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_ip_ban_form'),
@@ -204,7 +208,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_ban/user'] = array(
+  $items['admin/config/people/troll/ip_ban/user'] = array(
     'title' => 'IP Ban Form',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_confirm_ban_ip_form'),
@@ -212,7 +216,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_ban/delete'] = array(
+  $items['admin/config/people/troll/ip_ban/delete'] = array(
     'title' => 'Remove Ban',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_confirm_delete_ip_form'),
@@ -220,7 +224,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist'] = array(
+  $items['admin/config/people/troll/ip_blacklist'] = array(
     'title' => 'Blacklists',
     'page callback' => 'troll_blacklist_summary',
     'access arguments' => array('administer troll'),
@@ -228,7 +232,7 @@ function troll_menu() {
     'weight' => 2,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/summary'] = array(
+  $items['admin/config/people/troll/ip_blacklist/summary'] = array(
     'title' => 'Summary',
     'page callback' => 'troll_blacklist_summary',
     'access arguments' => array('administer troll'),
@@ -236,7 +240,7 @@ function troll_menu() {
     'weight' => 0,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/punishment'] = array(
+  $items['admin/config/people/troll/ip_blacklist/punishment'] = array(
     'title' => 'Visitor Punishment',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_blacklist_punishment_form'),
@@ -245,7 +249,7 @@ function troll_menu() {
     'weight' => 1,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/import'] = array(
+  $items['admin/config/people/troll/ip_blacklist/import'] = array(
     'title' => 'Import Blacklist',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_blacklist_import_form'),
@@ -254,7 +258,7 @@ function troll_menu() {
     'weight' => 2,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/search'] = array(
+  $items['admin/config/people/troll/ip_blacklist/search'] = array(
     'title' => 'Search Blacklisted IPs',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_blacklist_search_form'),
@@ -263,7 +267,7 @@ function troll_menu() {
     'weight' => 3,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/deleteblack'] = array(
+  $items['admin/config/people/troll/ip_blacklist/deleteblack'] = array(
     'title' => 'Delete Blacklisted IPs',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_confirm_delete_black_block_form'),
@@ -271,7 +275,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/whitelist'] = array(
+  $items['admin/config/people/troll/ip_blacklist/whitelist'] = array(
     'title' => 'Whitelist',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_whitelist_form'),
@@ -280,7 +284,7 @@ function troll_menu() {
     'weight' => 4,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/ip_blacklist/deletewhite'] = array(
+  $items['admin/config/people/troll/ip_blacklist/deletewhite'] = array(
     'title' => 'Delete Whitelisted IPs',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_confirm_delete_white_block_form'),
@@ -288,7 +292,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc',
   );
-  $items['admin/user/troll/dnsbl'] = array(
+  $items['admin/config/people/troll/dnsbl'] = array(
     'title' => 'DNS Blacklist',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_dnsbl_settings'),
@@ -297,7 +301,7 @@ function troll_menu() {
     'type' => MENU_LOCAL_TASK,
     'file' => 'troll.admin.inc'
   );
-  $items['admin/user/troll/dnsbl/test'] = array(
+  $items['admin/config/people/troll/dnsbl/test'] = array(
     'title' => 'IP test',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_dnsbl_test_form'),
@@ -305,7 +309,7 @@ function troll_menu() {
     'type' => MENU_CALLBACK,
     'file' => 'troll.admin.inc'
   );
-  $items['admin/user/troll/settings'] = array(
+  $items['admin/config/people/troll/settings'] = array(
     'title' => 'Settings',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('troll_admin_settings'),
@@ -325,12 +329,14 @@ function troll_menu() {
   return $items;
 }
 
+/* Commented out due to unclear functionality
 function troll_user_load($arg) {
-  $user = user_load(array('uid' => $arg));
-  if (!empty($user)) {
-    return $user->uid;
+  $account = user_load($arg[1]->uid);
+  if (!empty($account)) {
+    return $account->uid;
   }
 }
+*/
 
 /**
  * Convert dotted decimal IP to long integer and check for validity
@@ -398,7 +404,7 @@ function troll_insert_ip($edit) {
   $expires = ($edit['expires'] == 1) ? mktime(23, 59, 0, $edit['month'], $edit['day'], $edit['year']) : 0;
 
   db_query("DELETE FROM {troll_ip_ban} WHERE ip_address = '%s'", $edit['ip_address']);
-  if (db_query("INSERT INTO {troll_ip_ban} (ip_address, domain_name, created, expires, uid) VALUES ('%s', '%s', %d, %d, %d)", $edit['ip_address'], $edit['domain_name'], time(), $expires, $user->uid)) {
+  if (db_query("INSERT INTO {troll_ip_ban} (ip_address, domain_name, created, expires, uid) VALUES ('%s', '%s', %d, %d, %d)", $edit['ip_address'], $edit['domain_name'], REQUEST_TIME, $expires, $user->uid)) {
     drupal_set_message(t('IP ban added: %ip', array('%ip' => $edit['ip_address'])));
   }
   else {
@@ -435,7 +441,7 @@ function troll_check_ip() {
   $check = db_fetch_array($chk);
   if (!isset($check['uid'])) {
     $isql = "INSERT INTO {troll_ip_track} (uid, ip_address, created) VALUES (%d, '%s', %d)";
-    db_query($isql, $user->uid, ip_address(), time());
+    db_query($isql, $user->uid, ip_address(), REQUEST_TIME);
   }
 }
 
@@ -457,11 +463,11 @@ function troll_is_blacklisted() {
     return FALSE;
   }
   else {
-    $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));
+    $whitelisted = (bool)db_query_range('SELECT 1 FROM {troll_whitelist} WHERE net <= :net AND bcast >= :bcast', 0, 1, array(':net' => $longip, ':bcast' => $longip))->fetchField();
     if ($whitelisted) {
       return FALSE;
     }
-    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));
+    return (bool)db_query_range('SELECT 1 FROM {troll_blacklist} WHERE net <= :net AND bcast >= :bcast', 0, 1, array(':net' => $longip, ':bcast' => $longip))->fetchAll();
   }
 }
 
@@ -475,7 +481,7 @@ function troll_block_user($uid) {
   $user_edit['status'] = 0;
   // remove all their permissions roles
   $user_edit['roles'] = array();
-  $account = user_load(array('uid' => $uid));
+  $account = user_load($uid);
   user_save($account, $user_edit);
   sess_destroy_uid($uid);
   if (variable_get('troll_block_role', NULL)) {