diff -up old\userpoints_badges/userpoints_badges.info new\userpoints_badges/userpoints_badges.info
--- old\userpoints_badges/userpoints_badges.info	2011-07-08 00:44:32.000000000 -0400
+++ new\userpoints_badges/userpoints_badges.info	2011-10-25 10:19:50.390625000 -0400
@@ -3,11 +3,4 @@ description = Assign badges to users as 
 package = Userpoints
 dependencies[] = userpoints
 dependencies[] = user_badges
-core = 6.x
-
-; Information added by drupal.org packaging script on 2011-07-08
-version = "7.x-1.x-dev"
-core = "7.x"
-project = "userpoints_contrib"
-datestamp = "1310085871"
-
+core = 7.x
diff -up old\userpoints_badges/userpoints_badges.install new\userpoints_badges/userpoints_badges.install
--- old\userpoints_badges/userpoints_badges.install	2011-07-07 19:59:38.000000000 -0400
+++ new\userpoints_badges/userpoints_badges.install	2011-10-25 10:22:26.187500000 -0400
@@ -1,5 +1,9 @@
 <?php
-
+/**
+ * @file
+ * Schema, installation, uninstallation, and update functions for the
+ * Userpoints_Badges module.
+ */
 
 function userpoints_badges_schema() {
   $schema = array();
@@ -7,13 +11,13 @@ function userpoints_badges_schema() {
     'description' => 'Holds the user badge images',
     'fields' => array(
       'bid' => array(
-        'description' => t('Original badge ID'),
+        'description' => 'Original badge ID',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
       ),
       'userpoints_goal' => array(
-        'description' => t('Number points user much reach.'),
+        'description' => 'Number points user much reach.',
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
@@ -29,10 +33,8 @@ function userpoints_badges_schema() {
 }
 
 function userpoints_badges_install() {
-  drupal_install_schema('userpoints_badges');
 }
 
 function userpoints_badges_uninstall() {
-  drupal_uninstall_schema('userpoints_badges');
 }
 
diff -up old\userpoints_badges/userpoints_badges.module new\userpoints_badges/userpoints_badges.module
--- old\userpoints_badges/userpoints_badges.module	2011-07-07 19:59:38.000000000 -0400
+++ new\userpoints_badges/userpoints_badges.module	2011-10-25 11:05:58.218750000 -0400
@@ -1,47 +1,72 @@
 <?php
+/**
+ * @file
+ * Interface Userpoints and User_Badges modules.
+ */
 
+/**
+ * Implements  hook_menu().
+ */
 function userpoints_badges_menu() {
   $items = array();
-  // Add items if necessary
+  // Add items if necessary.
   return $items;
 }
 
-function userpoints_badges_form_alter(&$form, $form_state, $form_id) {
+/**
+ * Implements  hook_form_alter().
+ */
+function userpoints_badges_form_alter(&$form, &$form_state, $form_id) {
   if ('user_badges_edit_form' === $form_id) {
     if (isset($form['bid']) && isset($form['bid']['#value'])) {
-      $userpoints_goal = db_result(db_query("SELECT userpoints_goal FROM {userpoints_badges} WHERE bid=%d", $form['bid']['#value']));
+      $userpoints_goal = db_select('userpoints_badges', 'ub')
+        ->fields('ub', array('userpoints_goal'))
+        ->condition('bid', $form['bid']['#value'])
+        ->execute()
+        ->fetchCol();
     }
+
     if ($userpoints_goal !== '0' && empty($userpoints_goal)) {
       $userpoints_goal = '';
     }
+
     $form['userpoints_goal'] = array(
       '#type' => 'textfield',
       '#title' => t('Userpoints Goal'),
-      '#description' => t('Enter the minimum number of points a user must have to get this badge'),
+      '#description' => t('Enter the minimum number of points a user must have
+        to get this badge'),
       '#default_value' => $userpoints_goal,
       '#size' => 10,
       '#maxlength' => 10,
     );
     $form['submit']['#weight'] = 10;
-    
+
     $form['#validate'][] = 'userpoints_badges_edit_badge_validate';
     $form['#submit'][] = 'userpoints_badges_edit_badge_submit';
   }
-  else if ('user_badges_delete_form' === $form_id) {
-    $form['#submit'][] = 'userpoints_badges_delete_badge_submit';
+  else {
+    if ('user_badges_delete_form' === $form_id) {
+      $form['#submit'][] = 'userpoints_badges_delete_badge_submit';
+    }
   }
 }
 
 /**
- * Returns all userpoints related badges
+ * Returns all userpoints related badges.
  */
 function userpoints_badges_get_badges($select = 'normal') {
   static $userpoints_badges_list;
   if (!isset($userpoints_badges_list)) {
     $userpoints_badges_list = array('normal' => array(), 'select' => array());
-    $sql = db_query('SELECT b.bid, b.weight, b.name, b.image, u.userpoints_goal FROM {user_badges_badges} b INNER JOIN {userpoints_badges} u ON b.bid=u.bid ORDER BY b.weight, b.name');
-    while ($badge = db_fetch_object($sql)) {
-      $userpoints_badges_list['select']["badge-$badge->bid"] = $badge->name;
+    $result = db_select('user_badges_badges', 'b')
+      ->fields('b', array('bid', 'weight', 'name', 'image'))
+      ->fields('u', array('userpoints_goal'))
+      ->join('userpoints_badges', 'u', 'b.bid = u.bid')
+      ->orderBy('b.weight', 'asc')
+      ->orderBy('b.name', 'asc')
+      ->execute();
+    foreach ($result as $badge) {
+      $userpoints_badges_list['select']["badge-$badge->bid"] = check_plain($badge->name);
       $userpoints_badges_list['normal']["badge-$badge->bid"] = $badge;
     }
   }
@@ -49,7 +74,7 @@ function userpoints_badges_get_badges($s
 }
 
 /**
- * Extra validation on userpoints badge edit/create
+ * Extra validation on userpoints badge edit/create.
  */
 function userpoints_badges_edit_badge_validate($form, &$form_state) {
   $values = $form_state['values'];
@@ -59,7 +84,7 @@ function userpoints_badges_edit_badge_va
 }
 
 /**
- * Extra submit handler for the userpoints badge edit/create
+ * Extra submit handler for the userpoints badge edit/create.
  */
 function userpoints_badges_edit_badge_submit($form, &$form_state) {
   $form_values = $form_state['values'];
@@ -67,40 +92,57 @@ function userpoints_badges_edit_badge_su
     $bid = $form_values['bid'];
   }
   else {
-    $bid = db_result(db_query_range("SELECT b.bid FROM {user_badges_badges} b WHERE weight=%d AND name='%s' AND image='%s' ORDER BY bid DESC",
-      $form_values['weight'], $form_values['name'], $form_values['image'], 0, 1));
-  }
-  db_query("DELETE FROM {userpoints_badges} WHERE bid=%d", $bid);
-  
+    $bid = db_select('user_badges_badges', 'b')
+      ->fields('b', array('bid'))
+      ->condition('weight', $form_values['weight'])
+      ->condition('name', $form_values['name'])
+      ->condition('image', $form_values['image'])
+      ->orderBy('bid', 'desc')
+      ->range(0, 1)
+      ->execute()
+      ->fetchCol();
+  }
+  db_delete('userpoints_badges')
+    ->condition('bid', $bid)
+    ->execute();
+
   if (trim($form_values['userpoints_goal']) !== '') {
-    db_query("INSERT INTO {userpoints_badges} (bid, userpoints_goal) VALUES (%d, %d)",
-      $bid, $form_values['userpoints_goal']);
+    $id = db_insert('userpoints_badges')
+      ->fields(array('bid' => $bid, 'userpoints_goal' => $form_values['userpoints_goal']))
+      ->execute();
     userpoints_badges_run_mass_badge_check($bid, $form_values['userpoints_goal']);
   }
 }
 
 /**
- * Extra submit handler for the userpoints badge deletion
+ * Extra submit handler for the userpoints badge deletion.
  */
 function userpoints_badges_delete_badge_submit($form, &$form_state) {
-  db_query("DELETE FROM {userpoints_badges} WHERE bid=%d", $form_state['values']['bid']);
+  db_delete('userpoints_badges')
+    ->condition('bid', $form_state['values']['bid'])
+    ->execute();
 }
 
 /**
- * When a userpoints badge is created or edited, a mass check is run on the users to see if they qualify for the new badge 
+ * When a userpoints badge is created or edited, a mass check is run
+ * on the users to see if they qualify for the new badge
  */
 function userpoints_badges_run_mass_badge_check($bid, $userpoints_goal) {
-  db_query("DELETE FROM {user_badges_user} WHERE bid=%d", $bid);
-  $resultset = db_query("SELECT uid FROM {userpoints} WHERE uid > 0 GROUP BY uid HAVING SUM(points) > %d", 
-    $userpoints_goal);
-  while ($account = db_fetch_object($resultset)) {
-    user_badges_user_add_badge($account->uid, $bid, strtr('Userpoints @bid', array('@bid' => $bid)));
+  db_delete('user_badges_user')
+    ->condition('bid', $bid)
+    ->execute();
+  $resultset = db_query("SELECT uid FROM {userpoints} WHERE uid > 0
+    GROUP BY uid HAVING SUM(points) > :goal",
+    array(':goal' => $userpoints_goal));
+  foreach ($resultset as $account) {
+    user_badges_user_add_badge($account->uid, $bid,
+      strtr('Userpoints @bid', array('@bid' => $bid)));
   }
   drupal_set_message(t('Added all users with badges as well'));
 }
 
 /**
- * Implementation of hook_userpoints
+ * Implements  hook_userpoints().
  */
 function userpoints_badges_userpoints($op, $params = array()) {
   switch ($op) {
@@ -108,17 +150,21 @@ function userpoints_badges_userpoints($o
       $group = 'userpoints_badges';
       $form[$group] = array(
         '#type' => 'item',
-        '#value' => t('Go to !link to edit userpoint badges', array('!link' => l(t('Userpoints Badges Settings'), 'admin/user/user_badges')))
-      );
+        '#value' => t('Go to <a href="!link">Userpoints Badges Settings</a> to edit userpoint badges', array('!link' => url('admin/people/user_badges')))
+        );
       return $form;
+
     case 'points after':
       $badges = userpoints_badges_get_badges();
       $total_points = userpoints_get_current_points($params['uid'], 'all');
-      
-      // Remove all existing badges for this user
-      db_query("DELETE FROM {user_badges_user} WHERE uid = %d AND type LIKE 'Userpoints%'", $params['uid']);
-      
-      // Iterate through each badge and assign any badge that passes the threshold 
+
+      // Remove all existing badges for this user.
+      db_delete('user_badges_user')
+        ->condition('uid', $params['uid'])
+        ->condition('type', 'Userpoints%', 'like')
+        ->execute();
+
+      // Iterate through each badge and assign any badge that passes the threshold.
       foreach ($badges as $badge) {
         if ($total_points >= $badge->userpoints_goal) {
           user_badges_user_add_badge($params['uid'], $badge->bid, t('Userpoints @bid', array('@bid' => $badge->bid)));
@@ -128,11 +174,10 @@ function userpoints_badges_userpoints($o
 }
 
 /**
- * Figure out the best userpoint badge (ie the highest points the user has received)
+ * Figure out the best userpoint badge (ie the highest points the user has received).
  */
 function userpoints_badges_get_best_badge($uid) {
   if ($uid) {
-    // $account = user_load(array('uid' => $uid));
     $badges = userpoints_badges_get_badges();
     $badges_by_goal = array();
     $lookup = array();
@@ -142,7 +187,7 @@ function userpoints_badges_get_best_badg
       $lookup[$badge->bid] = $goal;
     }
     krsort($badges_by_goal, SORT_NUMERIC);
-  
+
     $user_badges = user_badges_get_badges($uid);
     $user_badges_by_goal = array();
     foreach ($user_badges as $badge) {
@@ -150,7 +195,7 @@ function userpoints_badges_get_best_badg
       $user_badges_by_goal[$goal] = $badge;
     }
     krsort($user_badges_by_goal, SORT_NUMERIC);
-    
+
     if (count($user_badges_by_goal)) {
       $badge = array_shift($user_badges_by_goal);
     }